diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2017-05-28 23:55:46 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2017-05-29 08:41:50 +0200 |
| commit | 542a34783ce1cfc63929ec50ab1f9f738711b815 (patch) | |
| tree | 5b2e9f93f498bca7a8a16408597967ed7fa63127 | |
| parent | acf6d579e0ebb1644417b6a7894ebe6794ec7667 (diff) | |
| download | glibc-542a34783ce1cfc63929ec50ab1f9f738711b815.tar.gz glibc-542a34783ce1cfc63929ec50ab1f9f738711b815.tar.xz glibc-542a34783ce1cfc63929ec50ab1f9f738711b815.zip | |
m68k: handle default PIE
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/m68k/Makefile | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 99efccf6a0..93f0088ace 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 5a887bba70..26539fa01d 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) |