From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Fri, 9 Apr 2010 17:02:52 +0000 (+0000)
Subject: sol2-gld.h: Remove SPARC reference.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=62e0852342ca9d580f5f3b0995b54c370f545c44;p=gcc.git

sol2-gld.h: Remove SPARC reference.

	* config/sparc/sol2-gld.h: Remove SPARC reference.
	Rename ...
	* config/sol2-gld.h: ... here.
	* config.gcc (sparc*-*-solaris2*): Reflect this.
	(i[34567]86-*-solaris2*): Use it.

From-SVN: r158171
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dbbba58a1c0..6ee7cb6d02f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* config/sparc/sol2-gld.h: Remove SPARC reference.
+	Rename ...
+	* config/sol2-gld.h: ... here.
+	* config.gcc (sparc*-*-solaris2*): Reflect this.
+	(i[34567]86-*-solaris2*): Use it.
+
 2010-04-09  Steve Ellcey  <sje@cup.hp.com>
 
 	* config/ia64/ia64.c (ia64_dfa_new_cycle): Remove unused variable
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 12334cd09d4..119bf0ac645 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1246,6 +1246,9 @@ i[34567]86-*-solaris2*)
 		;;
 	esac
 	tm_file="${tm_file} i386/sol2.h"
+	if test x$gnu_ld = xyes; then
+		tm_file="${tm_file} sol2-gld.h"
+	fi
 	if test x$gas = xyes; then
 		tm_file="${tm_file} i386/sol2-gas.h"
 	fi
@@ -2412,7 +2415,7 @@ sparc*-*-solaris2*)
 		tm_file="${tm_file} sparc/sol2-gas.h sparc/sol2-gas-bi.h"
 	fi
 	if test x$gnu_ld = xyes; then
-		tm_file="${tm_file} sparc/sol2-gld.h sparc/sol2-gld-bi.h"
+		tm_file="${tm_file} sol2-gld.h sparc/sol2-gld-bi.h"
 	fi
 	tm_file="${tm_file} tm-dwarf2.h"
 	tmake_file="t-sol2 sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtfm"
diff --git a/gcc/config/sol2-gld.h b/gcc/config/sol2-gld.h
new file mode 100644
index 00000000000..217e09259f6
--- /dev/null
+++ b/gcc/config/sol2-gld.h
@@ -0,0 +1,27 @@
+/* Definitions of target machine for GCC, for any machine running Solaris 2
+   using the GNU linker.
+
+   Copyright (C) 2002, 2010 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+/* Undefine this so that attribute((init_priority)) works.  */
+#undef CTORS_SECTION_ASM_OP
+#undef DTORS_SECTION_ASM_OP
+
+#undef SUPPORTS_INIT_PRIORITY
+#define SUPPORTS_INIT_PRIORITY 1
diff --git a/gcc/config/sparc/sol2-gld.h b/gcc/config/sparc/sol2-gld.h
deleted file mode 100644
index b63693c002f..00000000000
--- a/gcc/config/sparc/sol2-gld.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Definitions of target machine for GCC, for SPARC running Solaris 2
-   using the GNU linker.
-
-   Copyright (C) 2002, 2010 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
-
-/* Undefine this so that attribute((init_priority)) works.  */
-#undef CTORS_SECTION_ASM_OP
-#undef DTORS_SECTION_ASM_OP
-
-#undef SUPPORTS_INIT_PRIORITY
-#define SUPPORTS_INIT_PRIORITY 1