elf.h: Do not include sh/sh.h.

* config/sh/elf.h: Do not include sh/sh.h.
* config/sh/rtems.h: Likewise.
* config/sh/rtemself.h: Do not include sh/elf.h.
* configure.in: Get them included with `tm_file's.
* configure: Rebuilt.

From-SVN: r35793

gcc/ChangeLog

+Fri Aug 18 16:22:20 2000  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config/sh/elf.h: Do not include sh/sh.h.
+	* config/sh/rtems.h: Likewise.
+	* config/sh/rtemself.h: Do not include sh/elf.h.
+	* configure.in: Get them included with `tm_file's.
+	* configure: Rebuilt.
+
 Fri Aug 18 16:01:18 2000  Alexandre Oliva  <aoliva@redhat.com>
 
 	* config/sh/sh.md (fpu_switch0, fpu_switch1): Simplify.

gcc/config/sh/elf.h

@@ -19,9 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* Mostly like the regular SH configuration.  */
-#include "sh/sh.h"
-
 /* No SDB debugging info.  */
 #undef SDB_DEBUGGING_INFO
 

gcc/config/sh/rtems.h

@@ -19,8 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "sh/sh.h"
-
 /* Specify predefined symbols in preprocessor.  */
 
 #undef CPP_PREDEFINES

gcc/config/sh/rtemself.h

@@ -19,8 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "sh/elf.h"
-
 /* Specify predefined symbols in preprocessor.  */
 
 #undef CPP_PREDEFINES

gcc/configure.in

@@ -3279,6 +3279,12 @@ changequote([,])dnl
 		then
 			tmake_file=rs6000/t-xnewas
 		else
+			tmake_file=rs6000/t-newas
+		fi
+		if test "$gnu_ld" = yes
+		then
+			xmake_file=rs6000/x-aix41-gld
+		else
 			tmake_file='rs6000/t-newas rs6000/t-aix41'
 		fi
 		xmake_file=rs6000/x-aix41
@@ -3325,17 +3331,17 @@ changequote([,])dnl
 		use_collect2=yes
 		;;
 	sh-*-elf*)
-		tm_file=sh/elf.h
+		tm_file="sh/sh.h sh/elf.h"
 		float_format=sh
 		;;
 	sh-*-rtemself*)
 		tmake_file="sh/t-sh t-rtems"
-		tm_file=sh/rtemself.h
+		tm_file="sh/sh.h sh/elf.h sh/rtemself.h"
 		float_format=sh
 		;;
 	sh-*-rtems*)
 		tmake_file="sh/t-sh t-rtems"
-		tm_file=sh/rtems.h
+		tm_file="sh/sh.h sh/rtems.h"
 		float_format=sh
 		;;
 	sh-*-*)