From bfa8159478be6a8d4062f7d11d71315dc81a6829 Mon Sep 17 00:00:00 2001 From: Simon South Date: Thu, 22 Oct 2015 03:47:26 -0400 Subject: [PATCH] gcc: LINK_SPEC: Gently refactor Update LINK_SPEC (for arm, i386, x86_64 and ppc) with more compact but functionally equivalent sequences. Signed-off-by: Jérôme Duval --- gcc/gcc/config/arm/haiku.h | 6 ++++-- gcc/gcc/config/i386/haiku.h | 4 ++-- gcc/gcc/config/i386/haiku64.h | 4 ++-- gcc/gcc/config/rs6000/haiku.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gcc/gcc/config/arm/haiku.h b/gcc/gcc/config/arm/haiku.h index 955ce97..b15fdc1 100644 --- a/gcc/gcc/config/arm/haiku.h +++ b/gcc/gcc/config/arm/haiku.h @@ -78,7 +78,7 @@ #define LINK_SPEC \ "%{!o*:-o %b} -m armelf \ %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \ - :-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0} \ - %{shared:-shared -e 0} %{!shared: %{!nostart: -no-undefined}} \ - %{mbig-endian:-EB} %{mlittle-endian:-EL} -X" + :-pie --allow-shlib-undefined --export-dynamic} %{shared:-shared} \ + %{nostart|shared:-e 0;:-no-undefined} %{mbig-endian:-EB} \ + %{mlittle-endian:-EL} -X" diff --git a/gcc/gcc/config/i386/haiku.h b/gcc/gcc/config/i386/haiku.h index 5f54d1b..5320329 100644 --- a/gcc/gcc/config/i386/haiku.h +++ b/gcc/gcc/config/i386/haiku.h @@ -56,8 +56,8 @@ #define LINK_SPEC \ "-m elf_i386_haiku \ %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \ - :-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0} \ - %{shared:-shared -e 0} %{!shared: %{!nostart: -no-undefined}}" + :-pie --allow-shlib-undefined --export-dynamic} %{shared:-shared} \ + %{nostart|shared:-e 0;:-no-undefined}" /* A C statement (sans semicolon) to output to the stdio stream FILE the assembler definition of uninitialized global DECL named diff --git a/gcc/gcc/config/i386/haiku64.h b/gcc/gcc/config/i386/haiku64.h index d231aac..c225cdc 100644 --- a/gcc/gcc/config/i386/haiku64.h +++ b/gcc/gcc/config/i386/haiku64.h @@ -67,8 +67,8 @@ #define LINK_SPEC \ "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386_haiku} \ %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \ - :-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0} \ - %{shared:-shared -e 0} %{!shared: %{!nostart: -no-undefined}}" + :-pie --allow-shlib-undefined --export-dynamic} %{shared:-shared} \ + %{nostart|shared:-e 0;:-no-undefined}" /* A C statement (sans semicolon) to output to the stdio stream FILE the assembler definition of uninitialized global DECL named diff --git a/gcc/gcc/config/rs6000/haiku.h b/gcc/gcc/config/rs6000/haiku.h index 7219804..dd228e1 100644 --- a/gcc/gcc/config/rs6000/haiku.h +++ b/gcc/gcc/config/rs6000/haiku.h @@ -56,8 +56,8 @@ #define LINK_SPEC \ "%{!o*:-o %b} -m elf32ppchaiku \ %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \ - :-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0} \ - %{shared:-shared -e 0} %{!shared: %{!nostart: -no-undefined}}" + :-pie --allow-shlib-undefined --export-dynamic} %{shared:-shared} \ + %{nostart|shared:-e 0;:-no-undefined}" #undef CC1_SPEC #define CC1_SPEC \ -- gitore 0.2.2