Don't switch on -shared if the user specifies -r.

* Follow up to btrev43090, to include platforms missed in
  original commit.
This commit is contained in:
Jessica Hamilton 2014-10-13 04:15:32 +00:00
parent aeb1fcf62f
commit c700a4fe64
3 changed files with 3 additions and 3 deletions

View File

@ -65,7 +65,7 @@ Boston, MA 02111-1307, USA. */
#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

View File

@ -108,7 +108,7 @@ Boston, MA 02110-1301, USA. */
#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... */

View File

@ -53,4 +53,4 @@ Boston, MA 02111-1307, USA. */
/* 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}"