From 37d57ac9a636f2235f9060e84fb8dd7968abd1dc Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Tue, 8 May 2018 21:27:04 +0000 Subject: [PATCH] [PATCH] RISC-V: Use new linker emulations for glibc ABI. gcc/ * config/riscv/linux.h (MUSL_ABI_SUFFIX): Delete unnecessary backslash. (LD_EMUL_SUFFIX): New. (LINK_SPEC): Use it. From-SVN: r260056 --- gcc/ChangeLog | 6 ++++++ gcc/config/riscv/linux.h | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7b9d5a3..5600486 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-05-08 Jim Wilson + + * config/riscv/linux.h (MUSL_ABI_SUFFIX): Delete unnecessary backslash. + (LD_EMUL_SUFFIX): New. + (LINK_SPEC): Use it. + 2018-05-08 Kelvin Nilsen * doc/extend.texi (PowerPC Built-in Functions): Rename this diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h index aa8a28d..8556184 100644 --- a/gcc/config/riscv/linux.h +++ b/gcc/config/riscv/linux.h @@ -30,7 +30,7 @@ along with GCC; see the file COPYING3. If not see "%{mabi=ilp32d:}" \ "%{mabi=lp64:-sf}" \ "%{mabi=lp64f:-sp}" \ - "%{mabi=lp64d:}" \ + "%{mabi=lp64d:}" #undef MUSL_DYNAMIC_LINKER #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-riscv" XLEN_SPEC MUSL_ABI_SUFFIX ".so.1" @@ -49,8 +49,16 @@ along with GCC; see the file COPYING3. If not see #define CPP_SPEC "%{pthread:-D_REENTRANT}" +#define LD_EMUL_SUFFIX \ + "%{mabi=lp64d:}" \ + "%{mabi=lp64f:_lp64f}" \ + "%{mabi=lp64:_lp64}" \ + "%{mabi=ilp32d:}" \ + "%{mabi=ilp32f:_ilp32f}" \ + "%{mabi=ilp32:_ilp32}" + #define LINK_SPEC "\ --melf" XLEN_SPEC "lriscv \ +-melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \ %{mno-relax:--no-relax} \ %{shared} \ %{!shared: \ -- 2.7.4