From c67e8801d95237cf126a5b8ad6c2f59fc92c455a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 30 May 2015 17:04:15 +0000 Subject: [PATCH] m68k.h (ASM_PCREL_SPEC): Pass --pcrel also for implict or explicit -fPIE or -fpie. * config/m68k/m68k.h (ASM_PCREL_SPEC): Pass --pcrel also for implict or explicit -fPIE or -fpie. From-SVN: r223889 --- gcc/ChangeLog | 5 +++++ gcc/config/m68k/m68k.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7b3c784b9fc..9efdb9c1788 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-05-30 Andreas Schwab + + * config/m68k/m68k.h (ASM_PCREL_SPEC): Pass --pcrel also for + implict or explicit -fPIE or -fpie. + 2015-05-30 Mike Frysinger * 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 74ebff7fab4..b227c675226 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} \ " -- 2.30.2