lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Add include guards to dl-procinfo.h

Browse Source 
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.
This commit is contained in:
Siddhesh Poyarekar
2017-06-07 10:53:49 +05:30
parent ea9b0ecbf0
commit 6482e63403
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2017-06-07 Siddhesh Poyarekar <siddhesh@sourceware.org> 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. * elf/dl-tunables.list: Add glibc.tune.hwcap_mask.
* scripts/gen-tunables.awk: Include dl-procinfo.h. * scripts/gen-tunables.awk: Include dl-procinfo.h.
* manual/tunables.texi: Document glibc.tune.hwcap_mask. * manual/tunables.texi: Document glibc.tune.hwcap_mask.

3
sysdeps/unix/sysv/linux/i386/dl-procinfo.h
View File

@ -17,6 +17,8 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#ifndef _DL_I386_PROCINFO_H
#define _DL_I386_PROCINFO_H 1
#include <sysdeps/x86/dl-procinfo.h> #include <sysdeps/x86/dl-procinfo.h>
#undef _dl_procinfo #undef _dl_procinfo
@ -42,3 +44,4 @@ _dl_procinfo (unsigned int type, unsigned long int word)
return 0; return 0;
} }
#endif

3
sysdeps/unix/sysv/linux/s390/dl-procinfo.h
View File

@ -17,6 +17,8 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#ifndef _DL_S390_PROCINFO_H
#define _DL_S390_PROCINFO_H 1
#include <sysdeps/s390/dl-procinfo.h> #include <sysdeps/s390/dl-procinfo.h>
#include <ldsodefs.h> #include <ldsodefs.h>
@ -44,3 +46,4 @@ _dl_procinfo (unsigned int type, unsigned long int word)
return 0; return 0;
} }
#endif