sol2-64.h: Same as sol2-sld-64.h...

* config/sparc/sol2-64.h: Same as sol2-sld-64.h, except that
`-m EMULATION' is added to non-default LINK_ARCH_SPECs.
* configure.in: Use sol2-64.h instead of sol2-sld-64.h if linker
is GNU ld.
* configure: Rebuilt.

From-SVN: r30830

gcc/ChangeLog

+1999-12-08  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
+
+	* config/sparc/sol2-64.h: Same as sol2-sld-64.h, except that
+	`-m EMULATION' is added to non-default LINK_ARCH_SPECs.
+	* configure.in: Use sol2-64.h instead of sol2-sld-64.h if linker
+	is GNU ld.
+	* configure: Rebuilt.
+
 Wed Dec  8 03:45:40 1999  Richard Henderson  <rth@cygnus.com>
 
 	* alpha.c (secondary_reload_class): For !BWX, sub-simode

gcc/config/sparc/sol2-64.h

+/* Definitions of target machine for GNU compiler, for 64-bit SPARC
+   running Solaris 2 using the GNU linker.  */
+
+#include "sparc/sol2-sld-64.h"
+
+#ifdef LINKER_DOES_NOT_WORK_WITH_DWARF2
+#undef LINKER_DOES_NOT_WORK_WITH_DWARF2
+#endif
+
+#ifdef AS_SPARC64_FLAG
+
+#ifdef LINK_ARCH_SPEC
+#undef LINK_ARCH_SPEC
+#endif
+
+#define LINK_ARCH_SPEC "\
+%{m32:-m elf32_sparc %(link_arch32)} \
+%{m64:-m elf64_sparc %(link_arch64)} \
+%{!m32:%{!m64:%(link_arch_default)}} \
+"
+
+#endif

gcc/configure.in

@@ -3257,7 +3257,12 @@ changequote([,])dnl
 		tm_file=sparc/rtems.h
 		;;
 	sparcv9-*-solaris2*)
-		tm_file=sparc/sol2-sld-64.h
+		if test x$gnu_ld = xyes
+		then
+			tm_file=sparc/sol2-64.h
+		else
+			tm_file=sparc/sol2-sld-64.h
+		fi
 		xm_file="sparc/xm-sysv4-64.h sparc/xm-sol2.h"
 		xm_defines="USG POSIX"
 		tmake_file="sparc/t-sol2 sparc/t-sol2-64"
@@ -3312,7 +3317,12 @@ changequote(,)dnl
 		*-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;;
 changequote([,])dnl
 		*-*-solaris2*)
-			tm_file=sparc/sol2-sld-64.h
+			if test x$gnu_ld = xyes
+			then
+				tm_file=sparc/sol2-64.h
+			else
+				tm_file=sparc/sol2-sld-64.h
+			fi
 			tmake_file="$tmake_file sparc/t-sol2-64"
 			;;
 		esac