From 77ea4ed16046b68e27bd0862c15db419d1dac8ad Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 19 Jul 2017 12:04:14 -0700
Subject: Compile tst-prelink.c without PIE [BZ #21815]

tst-prelink.c checks for conflict with GLOB_DAT relocation against
stdout.  On i386, there is no GLOB_DAT relocation against stdout with
PIE.  Compile tst-prelink.c without PIE to generate GLOB_DAT relocation.

	[BZ #21815]
	* elf/Makefile (CFLAGS-tst-prelink.c): New.
	(LDFLAGS-tst-prelink): Likewise.
---
 elf/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/elf/Makefile b/elf/Makefile
index e758a4c..d39f4c5 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -356,6 +356,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
-- 
cgit v1.1