* config/i386/openbsdelf.h (LINK_SPEC): Use %{r:} not %{r*:}.

	* config/mips/openbsd.h (LINK_SPEC): Use %{r:} not %{r*:}.
	* config/netbsd-aout.h (NETBSD_LINK_SPEC_AOUT): Use %{r:} not
	%{r*:}.
	* config/netbsd-elf.h (NETBSD_LINK_SPEC_ELF): Use %{r:} not
	%{r*:}.
	* config/sparc/openbsd64.h (LINK_SPEC): Use %{r:} not %{r*:}.
	* config/vax/netbsd-elf.h (LINK_SPEC): Use %{r:} not %{r*:}.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167635 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8f04172..ee07dfe 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,16 @@
 2010-12-09  Joseph Myers  <joseph@codesourcery.com>
 
+       * config/i386/openbsdelf.h (LINK_SPEC): Use %{r:} not %{r*:}.
+       * config/mips/openbsd.h (LINK_SPEC): Use %{r:} not %{r*:}.
+       * config/netbsd-aout.h (NETBSD_LINK_SPEC_AOUT): Use %{r:} not
+       %{r*:}.
+       * config/netbsd-elf.h (NETBSD_LINK_SPEC_ELF): Use %{r:} not
+       %{r*:}.
+       * config/sparc/openbsd64.h (LINK_SPEC): Use %{r:} not %{r*:}.
+       * config/vax/netbsd-elf.h (LINK_SPEC): Use %{r:} not %{r*:}.
+
+2010-12-09  Joseph Myers  <joseph@codesourcery.com>
+
        * config/alpha/freebsd.h (LINK_SPEC): Don't use
        %{!dynamic-linker:}.
        * config/alpha/linux-elf.h (LINK_SPEC): Likewise.

diff --git a/gcc/config/i386/openbsdelf.h b/gcc/config/i386/openbsdelf.h
index a0c6810..e23bf1f 100644 (file)
--- a/gcc/config/i386/openbsdelf.h
+++ b/gcc/config/i386/openbsdelf.h
@@ -124,7 +124,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #undef LINK_SPEC
 #define LINK_SPEC \
-  "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \
+  "%{!shared:%{!nostdlib:%{!r:%{!e*:-e __start}}}} \
    %{shared:-shared} %{R*} \
    %{static:-Bstatic} \
    %{!static:-Bdynamic} \

diff --git a/gcc/config/mips/openbsd.h b/gcc/config/mips/openbsd.h
index f86bb5a..b067227 100644 (file)
--- a/gcc/config/mips/openbsd.h
+++ b/gcc/config/mips/openbsd.h
@@ -83,7 +83,7 @@ along with GCC; see the file COPYING3.  If not see
    %{call_shared} %{no_archive} %{exact_version} \
    %{!shared: %{!non_shared: %{!call_shared: -non_shared}}} \
    -dynamic-linker /usr/libexec/ld.so \
-   %{!nostdlib:%{!r*:%{!e*:-e __start}}} -dc -dp \
+   %{!nostdlib:%{!r:%{!e*:-e __start}}} -dc -dp \
    %{static:-Bstatic} %{!static:-Bdynamic} %{assert*}"
 
 /* -G is incompatible with -KPIC which is the default, so only allow objects

diff --git a/gcc/config/netbsd-aout.h b/gcc/config/netbsd-aout.h
index bf2bb9e..4581377 100644 (file)
--- a/gcc/config/netbsd-aout.h
+++ b/gcc/config/netbsd-aout.h
@@ -57,7 +57,7 @@ along with GCC; see the file COPYING3.  If not see
   "%{nostdlib:-nostdlib}               \
    %{!shared:                          \
      %{!nostdlib:                      \
-       %{!r*:                          \
+       %{!r:                           \
         %{!e*:-e start}}}              \
      -dc -dp                           \
      %{static:-Bstatic}}               \

diff --git a/gcc/config/netbsd-elf.h b/gcc/config/netbsd-elf.h
index d6f90f0..4fd55c1 100644 (file)
--- a/gcc/config/netbsd-elf.h
+++ b/gcc/config/netbsd-elf.h
@@ -73,7 +73,7 @@ along with GCC; see the file COPYING3.  If not see
    %{!shared: \
      -dc -dp \
      %{!nostdlib: \
-       %{!r*: \
+       %{!r: \
         %{!e*:-e %(netbsd_entry_point)}}} \
      %{!static: \
        %{rdynamic:-export-dynamic} \

diff --git a/gcc/config/sparc/openbsd64.h b/gcc/config/sparc/openbsd64.h
index 194c73b..3aef751 100644 (file)
--- a/gcc/config/sparc/openbsd64.h
+++ b/gcc/config/sparc/openbsd64.h
@@ -72,7 +72,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #undef LINK_SPEC
 #define LINK_SPEC \
-  "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \
+  "%{!shared:%{!nostdlib:%{!r:%{!e*:-e __start}}}} \
    %{shared:-shared} %{R*} \
    %{static:-Bstatic} \
    %{!static:-Bdynamic} \

diff --git a/gcc/config/vax/netbsd-elf.h b/gcc/config/vax/netbsd-elf.h
index 3468e02..4e64a23 100644 (file)
--- a/gcc/config/vax/netbsd-elf.h
+++ b/gcc/config/vax/netbsd-elf.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler,
    for NetBSD/vax ELF systems.
-   Copyright (C) 2002, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -52,7 +52,7 @@ along with GCC; see the file COPYING3.  If not see
    %{!shared: \
      -dc -dp \
      %{!nostdlib: \
-       %{!r*: \
+       %{!r: \
         %{!e*:-e %(netbsd_entry_point)}}} \
      %{!static:-static} \
      %{static:-static}}"