m68k: handle default PIE

diff --git a/ChangeLog b/ChangeLog
index 99efccf6a03e04811d65b28cf8f66a19b446d4b1..93f0088ace0e1ab54babf3ba7ce12cad6f988d00 100644 (file)
--- 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 5a887bba70165845b273ee9a4d0adab22bd5f3a2..26539fa01d38a5ba1260cb1fda153470513d2e29 100644 (file)
--- 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)