diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/Makefile | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 6a50d235f5..8291f6e05b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2017-08-04 H.J. Lu <hongjiu.lu@intel.com> + [BZ #21815] + * elf/Makefile (CFLAGS-tst-prelink.c): New. + (LDFLAGS-tst-prelink): Likewise. + +2017-08-04 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/unix/sysv/linux/i386/sysdep.h (I386_USE_SYSENTER): Define to I386_USE_SYSENTER to 0 or 1 if not defined. (ENTER_KERNEL): Check if I386_USE_SYSENTER is 1 and check PIC. diff --git a/elf/Makefile b/elf/Makefile index 2956445de8..828daaa0be 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -358,6 +358,9 @@ update-all-abi: update-all-abi-ld ifeq ($(have-glob-dat-reloc),yes) tests += tst-prelink +# Don't compile tst-prelink.c with PIE for GLOB_DAT relocation. +CFLAGS-tst-prelink.c += -fno-pie +LDFLAGS-tst-prelink = $(no-pie-ldflag) ifeq ($(run-built-tests),yes) tests-special += $(objpfx)tst-prelink-cmp.out endif |