From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun, 28 May 2017 21:55:46 +0000 (+0200)
Subject: m68k: handle default PIE
X-Git-Tag: glibc-2.26~452
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=542a34783ce1cfc63929ec50ab1f9f738711b815;p=thirdparty%2Fglibc.git

m68k: handle default PIE
---

diff --git a/ChangeLog b/ChangeLog
index 99efccf6a03..93f0088ace0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-29  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/m68k/Makefile (ASFLAGS-.o) [$(subdir) = csu &&
+	$(build-pie-default) = yes]: Define.
+
 2017-05-25  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* string/test-memchr.c (test_main): Add tests for n == 0.
diff --git a/sysdeps/m68k/Makefile b/sysdeps/m68k/Makefile
index 5a887bba701..26539fa01d3 100644
--- a/sysdeps/m68k/Makefile
+++ b/sysdeps/m68k/Makefile
@@ -29,6 +29,10 @@ pic-ccflag = -fpic
 ifeq ($(subdir),csu)
 # Make sure gcrt1.o uses the large PIC model
 CFLAGS-gmon-start.c := -fPIC
+ifeq ($(build-pie-default),yes)
+# Override default PIE
+ASFLAGS-.o += -fno-pie
+endif
 endif
 
 ifeq ($(subdir),setjmp)