diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 19:21:56 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-10-09 19:21:56 +0200 |
| commit | 525c181a5a9a95e24d2111b7792608151a40eb84 (patch) | |
| tree | 8ba16eeb3fb7327e5c3c5bba9c5786d4bb6ccec1 /sysdeps/s390/nptl/tls.h | |
| parent | 4dd9e35bfd35d3138bc44169baba098005bad51e (diff) | |
| parent | 7bb5f8a836b916d6ebf7b6921b136e99cea2442d (diff) | |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmem
Diffstat (limited to 'sysdeps/s390/nptl/tls.h')
| -rw-r--r-- | sysdeps/s390/nptl/tls.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sysdeps/s390/nptl/tls.h b/sysdeps/s390/nptl/tls.h index e6f8a47ecc..e4c3ec7830 100644 --- a/sysdeps/s390/nptl/tls.h +++ b/sysdeps/s390/nptl/tls.h @@ -1,5 +1,5 @@ /* Definition for thread-local data handling. NPTL/s390 version. - Copyright (C) 2003-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -53,7 +53,11 @@ typedef struct int gscope_flag; #ifndef __ASSUME_PRIVATE_FUTEX int private_futex; +#else + int __glibc_reserved1; #endif + /* GCC split stack support. */ + void *__private_ss; } tcbhead_t; # ifndef __s390x__ @@ -159,9 +163,9 @@ typedef struct /* Set the stack guard field in TCB head. */ #define THREAD_SET_STACK_GUARD(value) \ - do \ + do \ { \ - __asm __volatile ("" : : : "a0", "a1"); \ + __asm__ __volatile__ ("" : : : "a0", "a1"); \ THREAD_SETMEM (THREAD_SELF, header.stack_guard, value); \ } \ while (0) |