From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat, 30 May 2015 17:04:15 +0000 (+0000)
Subject: m68k.h (ASM_PCREL_SPEC): Pass --pcrel also for implict or explicit -fPIE or -fpie.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c67e8801d95237cf126a5b8ad6c2f59fc92c455a;p=gcc.git

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
---

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  <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 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} \
 "