Move SunOS 4 assembler flags from default_compilers into ASM_SPEC.

From-SVN: r9197

5 files changed, 19 insertions, 18 deletions

diff --git a/gcc/config/i386/sun.h b/gcc/config/i386/sun.h
index 5b39359..a27b14c 100644
--- a/gcc/config/i386/sun.h
+++ b/gcc/config/i386/sun.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running SunOS 4.0.
-   Copyright (C) 1988 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1995 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -39,7 +39,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Extra switches to give the assembler.  */
 
-#define ASM_SPEC "-i386"
+#define ASM_SPEC "%{R} -i386 %{keep-local-as-symbols:-L}"
 
 /* Specify predefined symbols in preprocessor.  */
 
diff --git a/gcc/config/m68k/sun2.h b/gcc/config/m68k/sun2.h
index a5cba1a..0a54f1e 100644
--- a/gcc/config/m68k/sun2.h
+++ b/gcc/config/m68k/sun2.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  Sun 68010 version.
-   Copyright (C) 1987, 1988 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1995 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -39,7 +39,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define ASM_SPEC \
  "%{m68020:-mc68020}%{mc68020:-mc68020}%{!mc68020:%{!m68020:-mc68010}} \
-  %{fpic:-k} %{fPIC:-k}"
+  %{fpic:-k} %{fPIC:-k} %{R} %{j} %{J} %{h} %{d2} %{keep-local-as-symbols:-L}"
   
 /* Names to predefine in the preprocessor for this target machine.  */
 
diff --git a/gcc/config/m68k/sun3.h b/gcc/config/m68k/sun3.h
index 8216d87..9ebdec2 100644
--- a/gcc/config/m68k/sun3.h
+++ b/gcc/config/m68k/sun3.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  Sun 68000/68020 version.
-   Copyright (C) 1987, 1988, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1993, 1995 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -78,7 +78,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define ASM_SPEC \
  "%{m68000:-mc68010}%{mc68000:-mc68010}%{!mc68000:%{!m68000:-mc68020}} \
-  %{fpic:-k} %{fPIC:-k}"
+  %{fpic:-k} %{fPIC:-k} %{R} %{j} %{J} %{h} %{d2} %{keep-local-as-symbols:-L}"
 
 /* Names to predefine in the preprocessor for this target machine.  */
 /* For a while,  -D_CROSS_TARGET_ARCH=SUN3 was included here,
diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index 9e0c11b..abeebd4 100644
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -70,7 +70,8 @@ extern enum arch_type sparc_arch_type;
 
 /* Special flags to the Sun-4 assembler when using pipe for input.  */
 
-#define ASM_SPEC " %| %{!pg:%{!p:%{fpic:-k} %{fPIC:-k}}}"
+#define ASM_SPEC \
+  " %| %{R} %{!pg:%{!p:%{fpic:-k} %{fPIC:-k}}} %{keep-local-as-symbols:-L}"
 
 /* Define macros to distinguish architectures.  */
 
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 07fba75..0443ca2 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -614,7 +614,7 @@ static struct compiler default_compilers[] =
 		   %{v:-version -fversion} %{f*}\
 		   %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
 		   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
-              %{!S:as %{R} %{j} %{J} %{h} %{d2} %a %{keep-local-as-symbols:-L} \
+              %{!S:as %a \
 		      %{c:%W{o*}%{!o*:-o %w%b.o}}%{!c:-o %d%w%u.o}\
                       %{!pipe:%g.s} %A\n }"},
   {".f", "@f77"},
@@ -625,7 +625,7 @@ static struct compiler default_compilers[] =
 		   %{v:-version -fversion} %{f*}\
 		   %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
 		   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
-              %{!S:as %{R} %{j} %{J} %{h} %{d2} %a %{keep-local-as-symbols:-L} \
+              %{!S:as %a \
 		      %{c:%W{o*}%{!o*:-o %w%b.o}}%{!c:-o %d%w%u.o}\
                       %{!pipe:%g.s} %A\n }"},
   {".c", "@c"},
@@ -647,7 +647,7 @@ static struct compiler default_compilers[] =
 		   %{aux-info*}\
 		   %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
 		   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
-              %{!S:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
+              %{!S:as %a %Y\
 		      %{c:%W{o*}%{!o*:-o %w%b.%O}}%{!c:-o %d%w%u.%O}\
                       %{!pipe:%g.s} %A\n }}}}"},
   {"-",
@@ -682,7 +682,7 @@ static struct compiler default_compilers[] =
 		   %{aux-info*}\
 		   %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
 		   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
-              %{!S:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
+              %{!S:as %a %Y\
 		      %{c:%W{o*}%{!o*:-o %w%b.%O}}%{!c:-o %d%w%u.%O}\
                       %{!pipe:%g.s} %A\n }}}}"},
   {".h", "@c-header"},
@@ -715,7 +715,7 @@ static struct compiler default_compilers[] =
 		   %{aux-info*} %X \
 		   %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
 		   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
-              %{!S:as %{R} %{j} %{J} %{h} %{d2} %a %Y %{keep-local-as-symbols:-L} \
+              %{!S:as %a %Y \
 		      %{c:%W{o*}%{!o*:-o %w%b.o}}%{!c:-o %d%w%u.o}\
                       %{!pipe:%g.s} %A\n }}"},
   {".cc", "@c++"},
@@ -740,7 +740,7 @@ static struct compiler default_compilers[] =
 			    %{f*} %{+e*} %{aux-info*}\
 			    %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
 			    %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}}|\n\
-              %{!S:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
+              %{!S:as %a %Y\
 		      %{c:%W{o*}%{!o*:-o %w%b.%O}}%{!c:-o %d%w%u.%O}\
                       %{!pipe:%g.s} %A\n }}}}"},
   {".i", "@cpp-output"},
@@ -751,7 +751,7 @@ static struct compiler default_compilers[] =
 			%{aux-info*}\
 			%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
 			%{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
-		     %{!S:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
+		     %{!S:as %a %Y\
 			     %{c:%W{o*}%{!o*:-o %w%b.%O}}%{!c:-o %d%w%u.%O}\
 			     %{!pipe:%g.s} %A\n }}}}"},
   {".ii", "@c++-cpp-output"},
@@ -762,12 +762,12 @@ static struct compiler default_compilers[] =
 			    %{f*} %{+e*} %{aux-info*}\
 			    %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
 			    %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
-	            %{!S:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
+	            %{!S:as %a %Y\
 			    %{c:%W{o*}%{!o*:-o %w%b.%O}}%{!c:-o %d%w%u.%O}\
 			    %{!pipe:%g.s} %A\n }}}}"},
   {".s", "@assembler"},
   {"@assembler",
-   "%{!M:%{!MM:%{!E:%{!S:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
+   "%{!M:%{!MM:%{!E:%{!S:as %a %Y\
 		            %{c:%W{o*}%{!o*:-o %w%b.%O}}%{!c:-o %d%w%u.%O}\
 			    %i %A\n }}}}"},
   {".S", "@assembler-with-cpp"},
@@ -780,7 +780,7 @@ static struct compiler default_compilers[] =
         %{traditional-cpp:-traditional}\
 	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
         %i %{!M:%{!MM:%{!E:%{!pipe:%g.s}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
-   "%{!M:%{!MM:%{!E:%{!S:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
+   "%{!M:%{!MM:%{!E:%{!S:as %a %Y\
                     %{c:%W{o*}%{!o*:-o %w%b.%O}}%{!c:-o %d%w%u.%O}\
 		    %{!pipe:%g.s} %A\n }}}}"},
   {".ads", "@ada"},
@@ -792,7 +792,7 @@ static struct compiler default_compilers[] =
 			  %{d*}\
 			  %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
 			  %i %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
-		    %{!S:%{!gnatc:%{!gnats:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
+		    %{!S:%{!gnatc:%{!gnats:as %a %Y\
 					      %{c:%W{o*}%{!o*:-o %w%b.%O}}\
 					      %{!c:-o %d%w%u.%O} %{!pipe:%g.s} %A\n}}}}}} "},
   /* Mark end of table */