Module Name:    src
Committed By:   mrg
Date:           Fri Jul  1 01:24:04 UTC 2011

Modified Files:
        src/external/gpl3/gcc/dist/gcc/config/sparc: netbsd-elf.h

Log Message:
fix a merge error.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h
diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.2 src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.3
--- src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.2	Tue Jun 21 02:41:37 2011
+++ src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h	Fri Jul  1 01:24:04 2011
@@ -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

Reply via email to