summaryrefslogtreecommitdiffstats
path: root/contrib/gcc/mips-tfile.c
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2013-11-21 16:38:57 +0000
committerpfg <pfg@FreeBSD.org>2013-11-21 16:38:57 +0000
commit3972b5f3cb8868deaacced6971ec71433c3dab40 (patch)
tree96688663ab2bd665ffb1db7e8d0122835df5086e /contrib/gcc/mips-tfile.c
parent20cd614dbb55fc5790f00533e96f871386a18cc2 (diff)
downloadFreeBSD-src-3972b5f3cb8868deaacced6971ec71433c3dab40.zip
FreeBSD-src-3972b5f3cb8868deaacced6971ec71433c3dab40.tar.gz
gcc: another round of merges from the gcc pre-43 branch.
Bring The following revisions from the gcc43 branch[1]: 118360, 118361, 118363, 118576, 119820, 123906, 125246, and 125721. They all have in common that the were merged long ago into Apple's gcc and should help improve the general quality of the compiler and make it easier to bring new features from Apple's gcc42. For details please review the additions to the files: gcc/ChangeLog.gcc43 gcc/cp/ChangeLog.gcc43 (new, adds previous revisions) Reference: [1] http://gcc.gnu.org/viewcvs/gcc/trunk/?pathrev=126700 Obtained from: gcc pre4.3 (GPLv2) branch MFC after: 3 weeks
Diffstat (limited to 'contrib/gcc/mips-tfile.c')
-rw-r--r--contrib/gcc/mips-tfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/gcc/mips-tfile.c b/contrib/gcc/mips-tfile.c
index 7530ac7..c543f97 100644
--- a/contrib/gcc/mips-tfile.c
+++ b/contrib/gcc/mips-tfile.c
@@ -667,11 +667,11 @@ main (void)
#include <signal.h>
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
#include <a.out.h>
#else
#include "mips/a.out.h"
-#endif /* CROSS_COMPILE */
+#endif /* CROSS_DIRECTORY_STRUCTURE */
#include "gstab.h"
OpenPOWER on IntegriCloud