diff options
Diffstat (limited to 'debian/patches/gcc-hash-style-gnu.diff')
| -rw-r--r-- | debian/patches/gcc-hash-style-gnu.diff | 65 |
1 files changed, 30 insertions, 35 deletions
diff --git a/debian/patches/gcc-hash-style-gnu.diff b/debian/patches/gcc-hash-style-gnu.diff index b3fc4b9..3fa418f 100644 --- a/debian/patches/gcc-hash-style-gnu.diff +++ b/debian/patches/gcc-hash-style-gnu.diff @@ -1,5 +1,5 @@ # DP: Link using --hash-style=gnu (aarch64, alpha, amd64, armel, armhf, ia64, -# DP: i386, powerpc, ppc64, s390, sparc) +# DP: i386, powerpc, ppc64, riscv64, s390, sparc) 2006-07-11 Jakub Jelinek <jakub@redhat.com> @@ -22,7 +22,11 @@ 2012-11-17 Matthias Klose <doko@ubuntu.com> * config/aarch64/aarch64-linux.h (LINK_SPEC): Add --hash-style=gnu. - + +2018-03-02 Aurelien Jarno <aurelien@aurel32.net> + + * config/riscv/linux.h (LINK_SPEC): Add --hash-style=gnu. + --- gcc/config/alpha/linux-elf.h | 2 +- gcc/config/i386/linux.h | 2 +- @@ -34,8 +38,6 @@ gcc/config/sparc/linux.h | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) -Index: b/src/gcc/config/alpha/linux-elf.h -=================================================================== --- a/src/gcc/config/alpha/linux-elf.h +++ b/src/gcc/config/alpha/linux-elf.h @@ -37,7 +37,7 @@ along with GCC; see the file COPYING3. @@ -47,8 +49,6 @@ Index: b/src/gcc/config/alpha/linux-elf.h %{O*:-O3} %{!O*:-O1} \ %{shared:-shared} \ %{!shared: \ -Index: b/src/gcc/config/ia64/linux.h -=================================================================== --- a/src/gcc/config/ia64/linux.h +++ b/src/gcc/config/ia64/linux.h @@ -58,7 +58,7 @@ do { \ @@ -60,43 +60,38 @@ Index: b/src/gcc/config/ia64/linux.h %{shared:-shared} \ %{!shared: \ %{!static: \ -Index: b/src/gcc/config/rs6000/linux64.h -=================================================================== --- a/src/gcc/config/rs6000/linux64.h +++ b/src/gcc/config/rs6000/linux64.h -@@ -469,12 +469,12 @@ extern int dot_symbols; +@@ -473,13 +473,13 @@ extern int dot_symbols; " -m elf64ppc") #endif -#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \ +#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --hash-style=gnu %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}} \ + %{!static-pie: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \ %(link_os_extra_spec32)" -#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \ +#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --hash-style=gnu %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}} \ - %(link_os_extra_spec64)" -Index: b/src/gcc/config/rs6000/sysv4.h -=================================================================== + %{!static-pie: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \ --- a/src/gcc/config/rs6000/sysv4.h +++ b/src/gcc/config/rs6000/sysv4.h -@@ -795,7 +795,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ - MUSL_DYNAMIC_LINKER) +@@ -790,7 +790,7 @@ GNU_USER_TARGET_CC1_SPEC + #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER + #endif -#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ +#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=gnu %{!shared: %{!static: \ %{rdynamic:-export-dynamic} \ -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}" -Index: b/src/gcc/config/s390/linux.h -=================================================================== --- a/src/gcc/config/s390/linux.h +++ b/src/gcc/config/s390/linux.h -@@ -65,7 +65,7 @@ along with GCC; see the file COPYING3. +@@ -77,7 +77,7 @@ along with GCC; see the file COPYING3. #undef LINK_SPEC #define LINK_SPEC \ @@ -105,11 +100,9 @@ Index: b/src/gcc/config/s390/linux.h %{shared:-shared} \ %{!shared: \ %{static:-static} \ -Index: b/src/gcc/config/sparc/linux.h -=================================================================== --- a/src/gcc/config/sparc/linux.h +++ b/src/gcc/config/sparc/linux.h -@@ -86,7 +86,7 @@ extern const char *host_detect_local_cpu +@@ -87,7 +87,7 @@ extern const char *host_detect_local_cpu #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" #undef LINK_SPEC @@ -118,11 +111,9 @@ Index: b/src/gcc/config/sparc/linux.h %{!mno-relax:%{!r:-relax}} \ %{!shared: \ %{!static: \ -Index: b/src/gcc/config/arm/linux-elf.h -=================================================================== --- a/src/gcc/config/arm/linux-elf.h +++ b/src/gcc/config/arm/linux-elf.h -@@ -72,6 +72,7 @@ +@@ -70,6 +70,7 @@ %{rdynamic:-export-dynamic} \ %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \ -X \ @@ -130,8 +121,6 @@ Index: b/src/gcc/config/arm/linux-elf.h %{mbig-endian:-EB} %{mlittle-endian:-EL}" \ SUBTARGET_EXTRA_LINK_SPEC -Index: b/src/gcc/config/i386/gnu-user.h -=================================================================== --- a/src/gcc/config/i386/gnu-user.h +++ b/src/gcc/config/i386/gnu-user.h @@ -74,7 +74,7 @@ along with GCC; see the file COPYING3. @@ -142,9 +131,7 @@ Index: b/src/gcc/config/i386/gnu-user.h +#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --hash-style=gnu %{shared:-shared} \ %{!shared: \ %{!static: \ - %{rdynamic:-export-dynamic} \ -Index: b/src/gcc/config/i386/gnu-user64.h -=================================================================== + %{!static-pie: \ --- a/src/gcc/config/i386/gnu-user64.h +++ b/src/gcc/config/i386/gnu-user64.h @@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTI @@ -155,8 +142,6 @@ Index: b/src/gcc/config/i386/gnu-user64.h %{shared:-shared} \ %{!shared: \ %{!static: \ -Index: b/src/gcc/config/aarch64/aarch64-linux.h -=================================================================== --- a/src/gcc/config/aarch64/aarch64-linux.h +++ b/src/gcc/config/aarch64/aarch64-linux.h @@ -35,6 +35,7 @@ @@ -167,3 +152,13 @@ Index: b/src/gcc/config/aarch64/aarch64-linux.h %{static:-Bstatic} \ %{shared:-shared} \ %{symbolic:-Bsymbolic} \ +--- a/src/gcc/config/riscv/linux.h ++++ b/src/gcc/config/riscv/linux.h +@@ -58,6 +58,7 @@ along with GCC; see the file COPYING3. + "%{mabi=ilp32:_ilp32}" + + #define LINK_SPEC "\ ++-hash-style=gnu \ + -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \ + %{mno-relax:--no-relax} \ + %{shared} \ |