Ticket #12430: 0002-gcc-CC1_SPEC-LINK_SPEC-Wrap-lines-at-80-columns.patch

File 0002-gcc-CC1_SPEC-LINK_SPEC-Wrap-lines-at-80-columns.patch, 6.3 KB (added by simonsouth, 9 years ago)

Wrap CC1_SPEC and LINK_SPEC lines at 80 columns

  • gcc/gcc/config/arm/haiku.h 

    From cb987c454bd5006fef83a6187206a6d50ac44637 Mon Sep 17 00:00:00 2001
From: Simon South <ssouth@simonsouth.com>
Date: Thu, 22 Oct 2015 03:00:45 -0400
Subject: [PATCH 2/4] gcc: CC1_SPEC, LINK_SPEC: Wrap lines at 80 columns

---
 gcc/gcc/config/arm/haiku.h    |  8 ++++++--
 gcc/gcc/config/haiku.h        |  4 +++-
 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/arm/haiku.h b/gcc/gcc/config/arm/haiku.h
index f0897fa..955ce97 100644
    a b  
    7575/* If ELF is the default format, we should not use /lib/elf.  */
    7676
    7777#undef  LINK_SPEC
    78 #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}}\
    79   %{mbig-endian:-EB} %{mlittle-endian:-EL} -X"
     78#define LINK_SPEC \
     79  "%{!o*:-o %b} -m armelf \
     80   %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \
     81   :-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0} \
     82   %{shared:-shared -e 0} %{!shared: %{!nostart: -no-undefined}} \
     83   %{mbig-endian:-EB} %{mlittle-endian:-EL} -X"
    8084

  • gcc/gcc/config/haiku.h 

    diff --git a/gcc/gcc/config/haiku.h b/gcc/gcc/config/haiku.h
index 7f456b7..27bab0a 100644
    a b Boston, MA 02111-1307, USA. */  
    4646   user explicitly asks for the warnings with -Wmultichar.  Note that
    4747   CC1_SPEC is used for both cc1 and cc1plus.  */
    4848#undef CC1_SPEC
    49 #define CC1_SPEC "%{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-fPIC} %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}"
     49#define CC1_SPEC \
     50  "%{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-fPIC} \
     51   %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}"
    5052
    5153#undef CC1PLUS_SPEC
    5254#define CC1PLUS_SPEC "%{!Wctor-dtor-privacy:-Wno-ctor-dtor-privacy}"

  • gcc/gcc/config/i386/haiku.h 

    diff --git a/gcc/gcc/config/i386/haiku.h b/gcc/gcc/config/i386/haiku.h
index fb98940..5f54d1b 100644
    a b Boston, MA 02111-1307, USA. */  
    5353/* If ELF is the default format, we should not use /lib/elf.  */
    5454
    5555#undef  LINK_SPEC
    56 #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}}"
     56#define LINK_SPEC \
     57  "-m elf_i386_haiku \
     58   %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \
     59   :-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0} \
     60   %{shared:-shared -e 0} %{!shared: %{!nostart: -no-undefined}}"
    5761
    5862/* A C statement (sans semicolon) to output to the stdio stream
    5963   FILE the assembler definition of uninitialized global DECL named

  • gcc/gcc/config/i386/haiku64.h 

    diff --git a/gcc/gcc/config/i386/haiku64.h b/gcc/gcc/config/i386/haiku64.h
index d1c9b4b..d231aac 100644
    a b Boston, MA 02111-1307, USA. */  
    6464#endif
    6565
    6666#undef  LINK_SPEC
    67 #define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386_haiku} \
    68     %{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}}"
     67#define LINK_SPEC \
     68  "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386_haiku} \
     69   %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \
     70   :-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0} \
     71   %{shared:-shared -e 0} %{!shared: %{!nostart: -no-undefined}}"
    6972
    7073/* A C statement (sans semicolon) to output to the stdio stream
    7174   FILE the assembler definition of uninitialized global DECL named

  • gcc/gcc/config/m68k/haiku.h 

    diff --git a/gcc/gcc/config/m68k/haiku.h b/gcc/gcc/config/m68k/haiku.h
index 9e47da4..94e8dff 100644
    a b Boston, MA 02110-1301, USA. */  
    108108
    109109#undef  LINK_SPEC
    110110/*#define LINK_SPEC "%{!o*:-o %b} -m elf_m68k_haiku -shared -no-undefined %{nostart:-e 0}"*/
    111 #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}"
     111#define LINK_SPEC \
     112  "%{!o*:-o %b} -m m68kelf \
     113   %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \
     114   :-pie --allow-shlib-undefined --export-dynamic} -no-undefined \
     115   %{nostart:-e 0}"
    112116
    113117/* XXX: not sure for the rest there... */
    114118

  • gcc/gcc/config/mips/haiku.h 

    diff --git a/gcc/gcc/config/mips/haiku.h b/gcc/gcc/config/mips/haiku.h
index 412d195..3bfa10a 100644
    a b Boston, MA 02111-1307, USA. */  
    4040  while (0)
    4141
    4242#undef  LINK_SPEC
    43 #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}"
     43#define LINK_SPEC \
     44  "%{!o*:-o %b} -m elf_mipsel_haiku \
     45   %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \
     46   :-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0}"
    4447

  • gcc/gcc/config/rs6000/haiku.h 

    diff --git a/gcc/gcc/config/rs6000/haiku.h b/gcc/gcc/config/rs6000/haiku.h
index 17c71eb..7219804 100644
    a b Boston, MA 02111-1307, USA. */  
    5353/* If ELF is the default format, we should not use /lib/elf.  */
    5454
    5555#undef  LINK_SPEC
    56 #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}}"
     56#define LINK_SPEC \
     57  "%{!o*:-o %b} -m elf32ppchaiku \
     58   %{shared|r|pie|fno-pic|fno-PIC|fno-pie|fno-PIE:; \
     59   :-pie --allow-shlib-undefined --export-dynamic} %{nostart:-e 0} \
     60   %{shared:-shared -e 0} %{!shared: %{!nostart: -no-undefined}}"
    5761
    5862#undef CC1_SPEC
    59 #define CC1_SPEC "%{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-fPIC} %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}"
     63#define CC1_SPEC \
     64  "%{fpic|fPIC|fpie|fPIE|fno-pic|fno-PIC|fno-pie|fno-PIE:;:-fPIC} \
     65   %{!Wmultichar: -Wno-multichar} %(cc1_cpu) %{profile:-p}"