From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Tue, 24 May 2011 17:51:51 +0000 (+0000)
Subject: re PR target/3746 (compilation of mips-tfile missing mips/a.out.h)
X-Git-Tag: releases/gcc-4.7.0~6549
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=caee412b75f90163b2ef164881a9737408f61a4e;p=thirdparty%2Fgcc.git

re PR target/3746 (compilation of mips-tfile missing mips/a.out.h)

	PR target/3746
	* config.gcc (alpha*-dec-osf5.1*): Only build mips-tfile,
	mips-tdump native.
	* mips-tfile.c: Remove CROSS_DIRECTORY_STRUCTURE handling.
	* mips-tdump.c: Likewise.

From-SVN: r174128
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d4aa0d85623..925c24a2fa96 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-24  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR target/3746
+	* config.gcc (alpha*-dec-osf5.1*): Only build mips-tfile,
+	mips-tdump native.
+	* mips-tfile.c: Remove CROSS_DIRECTORY_STRUCTURE handling.
+	* mips-tdump.c: Likewise.
+
 2011-05-24  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR target/49128
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 475c4e3cf3ad..5d52af7cfa68 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -748,7 +748,9 @@ alpha*-dec-osf5.1*)
 	then
 		tm_file="${tm_file} dbx.h"
 	fi
-	if test x$gas != xyes
+	# mips-tfile and mips-tdump are only used with the native assembler
+	# and require the Tru64 UNIX <a.out.h>, so only build native.
+	if test x$gas != xyes && test x${host} = x${target}
 	then
 		extra_passes="mips-tfile mips-tdump"
 	fi
diff --git a/gcc/mips-tdump.c b/gcc/mips-tdump.c
index ec9ceb0cecc0..f39b5a310f6a 100644
--- a/gcc/mips-tdump.c
+++ b/gcc/mips-tdump.c
@@ -26,11 +26,7 @@ along with GCC; see the file COPYING3.  If not see
 #ifdef index
 #undef index
 #endif
-#ifndef CROSS_DIRECTORY_STRUCTURE
 #include <a.out.h>
-#else
-#include "mips/a.out.h"
-#endif /* CROSS_DIRECTORY_STRUCTURE */
 
 /* Include getopt.h for the sake of getopt_long.  */
 #include "getopt.h"
diff --git a/gcc/mips-tfile.c b/gcc/mips-tfile.c
index af0b248f841f..3af6266b45c1 100644
--- a/gcc/mips-tfile.c
+++ b/gcc/mips-tfile.c
@@ -1,4 +1,4 @@
-/* Update the symbol table (the .T file) in a MIPS object to
+/* Update the symbol table (the .T file) in a ECOFF object to
    contain debugging information specified by the GNU compiler
    in the form of comments (the mips assembler does not support
    assembly access to debug information).
@@ -633,12 +633,7 @@ extern void error (const char *format, ...) ATTRIBUTE_PRINTF_1;
 
 #undef index
 
-#ifndef CROSS_DIRECTORY_STRUCTURE
 #include <a.out.h>
-#else
-#include "mips/a.out.h"
-#endif /* CROSS_DIRECTORY_STRUCTURE */
-
 #include "gstab.h"
 
 #define IS_ASM_IDENT(ch) \