diff options
| author | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2017-06-07 10:53:49 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@sourceware.org> | 2017-06-07 11:11:38 +0530 |
| commit | 6482e63403a3d13bf42f5029407b6151ad9f4ca5 (patch) | |
| tree | c8b754b3da87c5fd9219d495f44635e161bbb0d1 | |
| parent | ea9b0ecbf0e7b6e8281047624efbe1b2cbb6d487 (diff) | |
| download | glibc-6482e63403a3d13bf42f5029407b6151ad9f4ca5.tar.gz glibc-6482e63403a3d13bf42f5029407b6151ad9f4ca5.tar.xz glibc-6482e63403a3d13bf42f5029407b6151ad9f4ca5.zip | |
Add include guards to dl-procinfo.h
The dl-procinfo.h for linux/s390 and linux/i386 don't have include guards, which causes them to fail since addition of LD_HWCAP_MASK to tunables. Add _DL_I386_PROCINFO_H guard to avoid redefining _dl_procinfo on multiple includes and also allow the subsequent include of another dl-procinfo.h to work. Verified with a build test on i686. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Add include guard. * sysdeps/unix/sysv/linux/s390/dl-procinfo.h: Likewise.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/dl-procinfo.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/dl-procinfo.h | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 7a42c78932..26393d59e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2017-06-07 Siddhesh Poyarekar <siddhesh@sourceware.org> + * sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Add include + guard. + * sysdeps/unix/sysv/linux/s390/dl-procinfo.h: Likewise. + * elf/dl-tunables.list: Add glibc.tune.hwcap_mask. * scripts/gen-tunables.awk: Include dl-procinfo.h. * manual/tunables.texi: Document glibc.tune.hwcap_mask. diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h index a3a5f9d277..c590896ddf 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h @@ -17,6 +17,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef _DL_I386_PROCINFO_H +#define _DL_I386_PROCINFO_H 1 #include <sysdeps/x86/dl-procinfo.h> #undef _dl_procinfo @@ -42,3 +44,4 @@ _dl_procinfo (unsigned int type, unsigned long int word) return 0; } +#endif diff --git a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h index e756663107..7cbce0a043 100644 --- a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h @@ -17,6 +17,8 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef _DL_S390_PROCINFO_H +#define _DL_S390_PROCINFO_H 1 #include <sysdeps/s390/dl-procinfo.h> #include <ldsodefs.h> @@ -44,3 +46,4 @@ _dl_procinfo (unsigned int type, unsigned long int word) return 0; } +#endif |