diff options
| author | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-02-26 11:09:16 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-02-26 11:09:16 -0300 |
| commit | c69c361ca6bf95f8c665884ee863168a321d472a (patch) | |
| tree | 23d5270a90668070ffb6565fc384b8b0b68541a9 /sysdeps | |
| parent | 0d210b124d0211717c392dab3208fc49b0bb0ed6 (diff) | |
| parent | d5a4840c6b4025302f485b9271e4c72d315221f5 (diff) | |
| download | glibc-c69c361ca6bf95f8c665884ee863168a321d472a.tar.gz glibc-c69c361ca6bf95f8c665884ee863168a321d472a.tar.xz glibc-c69c361ca6bf95f8c665884ee863168a321d472a.zip | |
Merge branch 'release/2.20/master' into ibm/2.20/master
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/sigaction.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index e01df84a99..88383edc81 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -582,9 +582,6 @@ struct rtld_global_ro /* List of auditing interfaces. */ struct audit_ifaces *_dl_audit; unsigned int _dl_naudit; - - /* 0 if internal pointer values should not be guarded, 1 if they should. */ - EXTERN int _dl_pointer_guard; }; # define __rtld_global_attribute__ # ifdef IS_IN_rtld diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h index 7a0ca7eea2..b1b121d9b7 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h @@ -20,6 +20,8 @@ # error "Never include <bits/sigaction.h> directly; use <signal.h> instead." #endif +#include <bits/wordsize.h> + /* Structure describing the action to be taken when a signal arrives. */ struct sigaction { @@ -43,7 +45,9 @@ struct sigaction __sigset_t sa_mask; /* Special flags. */ +#if __WORDSIZE == 64 int __glibc_reserved0; +#endif int sa_flags; /* Not used by Linux/Sparc yet. */ |