From aff4b1860dc02c61ccc4c1d1783e1bed7d1cf6d4 Mon Sep 17 00:00:00 2001 From: Simon South Date: Thu, 22 Oct 2015 03:00:45 -0400 Subject: [PATCH] gcc: CC1_SPEC, LINK_SPEC: Wrap lines at 80 columns Signed-off-by: Jérôme Duval --- gcc/gcc/config/haiku.h | 4 +++- gcc/gcc/config/arm/haiku.h | 8 +++++++- gcc/gcc/config/i386/haiku.h | 6 +++++- gcc/gcc/config/i386/haiku64.h | 7 +++++-- gcc/gcc/config/m68k/haiku.h | 6 +++++- gcc/gcc/config/mips/haiku.h | 5 ++++- gcc/gcc/config/rs6000/haiku.h | 10 +++++++++- 7 files changed, 36 insertions(+), 10 deletions(-) diff --git a/gcc/gcc/config/haiku.h b/gcc/gcc/config/haiku.h index 7f456b7..27bab0a 100644 --- a/gcc/gcc/config/haiku.h +++ b/gcc/gcc/config/haiku.h @@ -46,7 +46,9 @@ user explicitly asks for the warnings with -Wmultichar. Note that CC1_SPEC is used for both cc1 and cc1plus. */ #undef CC1_SPEC -#define CC1_SPEC "%{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-fPIC} %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}" +#define CC1_SPEC \ + "%{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-fPIC} \ + %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}" #undef CC1PLUS_SPEC #define CC1PLUS_SPEC "%{!Wctor-dtor-privacy:-Wno-ctor-dtor-privacy}" diff --git a/gcc/gcc/config/arm/haiku.h b/gcc/gcc/config/arm/haiku.h index f0897fa..955ce97 100644 --- a/gcc/gcc/config/arm/haiku.h +++ b/gcc/gcc/config/arm/haiku.h @@ -75,6 +75,10 @@ /* If ELF is the default format, we should not use /lib/elf. */ #undef LINK_SPEC -#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" +#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" diff --git a/gcc/gcc/config/i386/haiku.h b/gcc/gcc/config/i386/haiku.h index fb98940..5f54d1b 100644 --- a/gcc/gcc/config/i386/haiku.h +++ b/gcc/gcc/config/i386/haiku.h @@ -53,7 +53,11 @@ /* If ELF is the default format, we should not use /lib/elf. */ #undef LINK_SPEC -#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}}" +#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}}" /* 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 d1c9b4b..d231aac 100644 --- a/gcc/gcc/config/i386/haiku64.h +++ b/gcc/gcc/config/i386/haiku64.h @@ -64,8 +64,11 @@ #endif #undef LINK_SPEC -#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}}" +#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}}" /* 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/m68k/haiku.h b/gcc/gcc/config/m68k/haiku.h index 9e47da4..94e8dff 100644 --- a/gcc/gcc/config/m68k/haiku.h +++ b/gcc/gcc/config/m68k/haiku.h @@ -108,7 +108,11 @@ #undef LINK_SPEC /*#define LINK_SPEC "%{!o*:-o %b} -m elf_m68k_haiku -shared -no-undefined %{nostart:-e 0}"*/ -#define LINK_SPEC "%{!o*:-o %b} -m m68kelf %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-pie --allow-shlib-undefined --export-dynamic} -no-undefined %{nostart:-e 0}" +#define LINK_SPEC \ + "%{!o*:-o %b} -m m68kelf \ + %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \ + :-pie --allow-shlib-undefined --export-dynamic} -no-undefined \ + %{nostart:-e 0}" /* XXX: not sure for the rest there... */ diff --git a/gcc/gcc/config/mips/haiku.h b/gcc/gcc/config/mips/haiku.h index 412d195..3bfa10a 100644 --- a/gcc/gcc/config/mips/haiku.h +++ b/gcc/gcc/config/mips/haiku.h @@ -40,5 +40,8 @@ while (0) #undef LINK_SPEC -#define LINK_SPEC "%{!o*:-o %b} -m elf_mipsel_haiku %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0}" +#define LINK_SPEC \ + "%{!o*:-o %b} -m elf_mipsel_haiku \ + %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \ + :-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0}" diff --git a/gcc/gcc/config/rs6000/haiku.h b/gcc/gcc/config/rs6000/haiku.h index 17c71eb..7219804 100644 --- a/gcc/gcc/config/rs6000/haiku.h +++ b/gcc/gcc/config/rs6000/haiku.h @@ -53,7 +53,13 @@ /* If ELF is the default format, we should not use /lib/elf. */ #undef LINK_SPEC -#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}}" +#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}}" #undef CC1_SPEC -#define CC1_SPEC "%{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-fPIC} %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}" +#define CC1_SPEC \ + "%{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-fPIC} \ + %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}" -- gitore 0.2.2