From c700a4fe642f3dad034b9735b4a780bd337b73c1 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Mon, 13 Oct 2014 04:15:32 +0000 Subject: [PATCH] Don't switch on -shared if the user specifies -r. * Follow up to btrev43090, to include platforms missed in original commit. --- gcc/gcc/config/i386/haiku64.h | 2 +- gcc/gcc/config/m68k/haiku.h | 2 +- gcc/gcc/config/rs6000/haiku.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/gcc/config/i386/haiku64.h b/gcc/gcc/config/i386/haiku64.h index 55550ab..41b3319 100644 --- a/gcc/gcc/config/i386/haiku64.h +++ b/gcc/gcc/config/i386/haiku64.h @@ -65,7 +65,7 @@ #undef LINK_SPEC #define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386_haiku} \ - -shared %{nostart:-e 0} %{shared:-e 0} %{!shared: %{!nostart: -no-undefined}}" + %{!r:-shared} %{nostart:-e 0} %{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 5761140..358c19f 100644 --- a/gcc/gcc/config/m68k/haiku.h +++ b/gcc/gcc/config/m68k/haiku.h @@ -108,7 +108,7 @@ #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 -no-undefined %{nostart:-e 0}" +#define LINK_SPEC "%{!o*:-o %b} -m m68kelf %{!r:-shared} -no-undefined %{nostart:-e 0}" /* XXX: not sure for the rest there... */ diff --git a/gcc/gcc/config/rs6000/haiku.h b/gcc/gcc/config/rs6000/haiku.h index 41c950e..b511918 100644 --- a/gcc/gcc/config/rs6000/haiku.h +++ b/gcc/gcc/config/rs6000/haiku.h @@ -53,4 +53,4 @@ /* If ELF is the default format, we should not use /lib/elf. */ #undef LINK_SPEC -#define LINK_SPEC "%{!o*:-o %b} -m elf_ppc_haiku -shared -no-undefined %{nostart:-e 0}" +#define LINK_SPEC "%{!o*:-o %b} -m elf_ppc_haiku %{!r:-shared} -no-undefined %{nostart:-e 0}" -- gitore 0.2.2