From 05de394bf942c4d6d88b0881ebd61386247a3d5d Mon Sep 17 00:00:00 2001 From: David O'Brien Date: Thu, 3 May 2001 07:56:42 +0000 Subject: [PATCH] config.gcc, [...]: Do not directly include rs6000/rs6000.h. 2001-05-02 David O'Brien * config.gcc, config/rs6000/aix51.h, config/rs6000/mach.h: Do not directly include rs6000/rs6000.h. Instead do it in tm.h. Approved by: Geoff Keating Message-ID: From-SVN: r41782 --- gcc/ChangeLog | 5 +++++ gcc/config.gcc | 4 ++-- gcc/config/rs6000/aix51.h | 3 --- gcc/config/rs6000/mach.h | 2 -- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a2dee76..a1418e8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-05-02 David O'Brien + + * config.gcc, config/rs6000/aix51.h, config/rs6000/mach.h: Do not + directly include rs6000/rs6000.h. Instead do it in tm.h. + 2001-05-02 Stan Shebs * objc/objc-act.c (STRING_OBJECT_CLASS_NAME): Default to diff --git a/gcc/config.gcc b/gcc/config.gcc index 4f0d3dc..ba6c0ff 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2741,7 +2741,7 @@ rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*) ;; rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*) xm_defines=POSIX - tm_file="${tm_file} rs6000/aix.h rs6000/aix51.h" + tm_file="${tm_file} rs6000/aix.h rs6000/rs6000.h rs6000/aix.h rs6000/aix51.h" tmake_file=rs6000/t-aix43 float_format=none use_collect2=yes @@ -2760,7 +2760,7 @@ rs6000-bull-bosx) use_collect2=yes ;; rs6000-*-mach*) - tm_file=rs6000/mach.h + tm_file="rs6000/rs6000.h rs6000/mach.h" xm_defines=POSIX use_collect2=yes ;; diff --git a/gcc/config/rs6000/aix51.h b/gcc/config/rs6000/aix51.h index da6361c..5875956 100644 --- a/gcc/config/rs6000/aix51.h +++ b/gcc/config/rs6000/aix51.h @@ -21,9 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "rs6000/rs6000.h" -#include "rs6000/aix.h" - /* AIX V5 and above support 64-bit executables. */ #undef SUBSUBTARGET_SWITCHES #define SUBSUBTARGET_SWITCHES \ diff --git a/gcc/config/rs6000/mach.h b/gcc/config/rs6000/mach.h index dfa23e6..453fe77 100644 --- a/gcc/config/rs6000/mach.h +++ b/gcc/config/rs6000/mach.h @@ -22,8 +22,6 @@ Boston, MA 02111-1307, USA. */ #define TARGET_AIX 0 -#include "rs6000/rs6000.h" - /* We don't define AIX under MACH; instead we define `unix'. */ #undef CPP_PREDEFINES #define CPP_PREDEFINES "-Drios -D_IBMR2 -Dunix -Asystem=unix -Asystem=mach -Acpu=rs6000 -Amachine=rs6000" -- 2.7.4