[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/sparc fix a merge error.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/050720d2ef9d
branches:  trunk
changeset: 766714:050720d2ef9d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 01 01:24:04 2011 +0000

description:
fix a merge error.

diffstat:

 external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r aba93db5d9c0 -r 050720d2ef9d external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h
--- a/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h      Fri Jul 01 01:23:23 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h      Fri Jul 01 01:24:04 2011 +0000
@@ -132,7 +132,9 @@
            %{!mf934: \
              %{!mv8*: \
                %{!msupersparc:-mcpu=ultrasparc}}}}}}} \
-    %{!mno-vis:%{!mcpu=v9:-mvis}}" \
+    %{!mno-vis:%{!mcpu=v9:-mvis}} \
+    %{p:-mcmodel=medlow} \
+    %{pg:-mcmodel=medlow}}" \
   NETBSD_CC1_AND_CC1PLUS_SPEC
 
 #define CC1_SPEC64 \
@@ -150,7 +152,10 @@
          %{!mf930: \
            %{!mf934: \
              %{!mv8*: \
-               %{!msupersparc:-mcpu=cypress}}}}}}}}" \
+               %{!msupersparc:-mcpu=cypress}}}}}}}} \
+  %{!m32: \
+      %{p:-mcmodel=medlow} \
+      %{pg:-mcmodel=medlow}}" \
   NETBSD_CC1_AND_CC1PLUS_SPEC
 
 /* Make sure we use the right output format.  Pick a default and then