diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/m68k/m68k.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7b3c784..9efdb9c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-05-30 Andreas Schwab <schwab@linux-m68k.org> + + * config/m68k/m68k.h (ASM_PCREL_SPEC): Pass --pcrel also for + implict or explicit -fPIE or -fpie. + 2015-05-30 Mike Frysinger <vapier@gentoo.org> * gcc/config/alpha/elf.h (ASM_SPEC): Add %{mcpu=*:-m%*}. diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h index 74ebff7..b227c67 100644 --- a/gcc/config/m68k/m68k.h +++ b/gcc/config/m68k/m68k.h @@ -40,8 +40,8 @@ along with GCC; see the file COPYING3. If not see %{m68020-40:-m68040}%{m68020-60:-m68040}\ %{mcpu=*:-mcpu=%*}%{march=*:-march=%*}\ " -#define ASM_PCREL_SPEC "%{" FPIC_SPEC ":--pcrel} \ - %{mpcrel:%{" NO_FPIC_SPEC ":--pcrel}} \ +#define ASM_PCREL_SPEC "%{" FPIE_OR_FPIC_SPEC ":--pcrel} \ + %{mpcrel:%{" NO_FPIE_AND_FPIC_SPEC ":--pcrel}} \ %{msep-data|mid-shared-library:--pcrel} \ " |