diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-05-26 17:46:57 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-05-26 17:46:57 +0000 |
| commit | d8d5895e420d4976fca22b9bd9e1edc3094ebf30 (patch) | |
| tree | f96c015c14ac0428150153ba98f7a681ff021931 /libc/sysdeps/generic | |
| parent | 62eb53f68d92687a028f3c515489b30e3df1d979 (diff) | |
Merge changes between r18519 and r18730 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@18731 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/generic')
| -rw-r--r-- | libc/sysdeps/generic/bits/hwcap.h | 23 | ||||
| -rw-r--r-- | libc/sysdeps/generic/ldsodefs.h | 3 | ||||
| -rw-r--r-- | libc/sysdeps/generic/stackguard-macros.h | 4 |
3 files changed, 30 insertions, 0 deletions
diff --git a/libc/sysdeps/generic/bits/hwcap.h b/libc/sysdeps/generic/bits/hwcap.h new file mode 100644 index 000000000..b27d2febb --- /dev/null +++ b/libc/sysdeps/generic/bits/hwcap.h @@ -0,0 +1,23 @@ +/* Defines for bits in AT_HWCAP. + Copyright (C) 2012 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _SYS_AUXV_H +# error "Never include <bits/hwcap.h> directly; use <sys/auxv.h> instead." +#endif + +/* No bits defined for this architecture. */ diff --git a/libc/sysdeps/generic/ldsodefs.h b/libc/sysdeps/generic/ldsodefs.h index 16bcfd10c..40fdf3c27 100644 --- a/libc/sysdeps/generic/ldsodefs.h +++ b/libc/sysdeps/generic/ldsodefs.h @@ -605,6 +605,9 @@ struct rtld_global_ro /* Mask for important hardware capabilities we honour. */ EXTERN uint64_t _dl_hwcap_mask; + /* Pointer to the auxv list supplied to the program at startup. */ + EXTERN ElfW(auxv_t) *_dl_auxv; + /* Get architecture specific definitions. */ #define PROCINFO_DECL #ifndef PROCINFO_CLASS diff --git a/libc/sysdeps/generic/stackguard-macros.h b/libc/sysdeps/generic/stackguard-macros.h new file mode 100644 index 000000000..ababf65d3 --- /dev/null +++ b/libc/sysdeps/generic/stackguard-macros.h @@ -0,0 +1,4 @@ +#include <stdint.h> + +extern uintptr_t __stack_chk_guard; +#define STACK_CHK_GUARD __stack_chk_guard |