Skip to content

R
riscv-gcc-1
Commit 670866a5 by Michael Meissner
Options

-mrelocatable needs -meabi 

From-SVN: r11899
parent c7690c68
Showing with 11 additions and 2 deletions
gcc/config/rs6000/sysv4.h
...@@ -134,7 +134,10 @@ do { \ ...@@ -134,7 +134,10 @@ do { \
target_flags |= MASK_EABI; \ target_flags |= MASK_EABI; \
} \ } \
else if (!strcmp (rs6000_abi_name, "aix")) \ else if (!strcmp (rs6000_abi_name, "aix")) \
rs6000_current_abi = ABI_AIX_NODESC; \ { \
rs6000_current_abi = ABI_AIX_NODESC; \
target_flags |= MASK_EABI; \
} \
else if (!strcmp (rs6000_abi_name, "aixdesc")) \ else if (!strcmp (rs6000_abi_name, "aixdesc")) \
rs6000_current_abi = ABI_AIX; \ rs6000_current_abi = ABI_AIX; \
else if (!strcmp (rs6000_abi_name, "nt")) \ else if (!strcmp (rs6000_abi_name, "nt")) \
...@@ -160,6 +163,12 @@ do { \ ...@@ -160,6 +163,12 @@ do { \
error ("-mrelocatable and -msdata are incompatible."); \ error ("-mrelocatable and -msdata are incompatible."); \
} \ } \
\ \
if (TARGET_RELOCATABLE && !TARGET_EABI) \
{ \
target_flags |= ~MASK_EABI; \
error ("-mrelocatable and -mno-eabi are incompatible."); \
} \
\
if (TARGET_SDATA && DEFAULT_ABI != ABI_V4 \ if (TARGET_SDATA && DEFAULT_ABI != ABI_V4 \
&& DEFAULT_ABI != ABI_SOLARIS) \ && DEFAULT_ABI != ABI_SOLARIS) \
{ \ { \
......
gcc/config/rs6000/t-ppcgas
...@@ -45,7 +45,7 @@ MULTILIB_MATCHES = mlittle=mlittle-endian \ ...@@ -45,7 +45,7 @@ MULTILIB_MATCHES = mlittle=mlittle-endian \
mcall-sysv-eabi=meabi \ mcall-sysv-eabi=meabi \
mcall-sysv-noeabi=mno-eabi mcall-sysv-noeabi=mno-eabi
MULTILIB_EXCEPTIONS = MULTILIB_EXCEPTIONS = *mrelocatable*/*mcall-sysv-noeabi*
LIBGCC = stmp-multilib stmp-crt LIBGCC = stmp-multilib stmp-crt
INSTALL_LIBGCC = install-multilib install-crt INSTALL_LIBGCC = install-multilib install-crt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment