dummy import to prevent merge lossage

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24349 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 17 insertions, 31 deletions

diff --git a/gcc/config/rs6000/sol2.h b/gcc/config/rs6000/sol2.h
index f75ad2b5885..0a73c4d26d5 100644
--- a/gcc/config/rs6000/sol2.h
+++ b/gcc/config/rs6000/sol2.h
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler,
    for IBM RS/6000 running AIX version 3.1.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    Contributed by David Reese (Dave.Reese@East.Sun.COM)
 
 This file is part of GNU CC.
@@ -46,6 +46,15 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef	LINK_START_DEFAULT_SPEC
 #define LINK_START_DEFAULT_SPEC "%(link_start_solaris)"
 
+#undef CPP_SPEC
+#define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
+%(cpp_sysv) %(cpp_endian) %(cpp_cpu) \
+%{mmvme: %(cpp_os_mvme) } \
+%{msim: %(cpp_os_sim) } \
+%{mcall-linux: %(cpp_os_linux) } \
+%{mcall-solaris: %(cpp_os_solaris) } \
+%{!mmvme: %{!msim: %{!mcall-linux: %{!mcall-solaris: %(cpp_os_default) }}}}"
+
 #undef	CPP_OS_DEFAULT_SPEC
 #define	CPP_OS_DEFAULT_SPEC "%(cpp_os_solaris)"
 
@@ -165,3 +174,5 @@ while (0)
 
 #undef	MULTILIB_DEFAULTS
 #define	MULTILIB_DEFAULTS { "mlittle", "mcall-solaris" }
+
+#define STDC_0_IN_SYSTEM_HEADERS
diff --git a/gcc/config/rs6000/t-ppcos b/gcc/config/rs6000/t-ppcos
index fe1d6ad64c1..480665a8937 100644
--- a/gcc/config/rs6000/t-ppcos
+++ b/gcc/config/rs6000/t-ppcos
@@ -1,4 +1,5 @@
-# Target config file for a System V based system (Solaris, Linux, Netbsd) with gas
+# Target config file for a System V based system (Solaris, GNU/Linux, Netbsd)
+# with gas.
 
 # Build libgcc.a with different options.  With gas, build pic libraries
 # as well no floating point
diff --git a/gcc/config/rs6000/tramp.asm b/gcc/config/rs6000/tramp.asm
index 57b47013748..47ab7d65b1f 100644
--- a/gcc/config/rs6000/tramp.asm
+++ b/gcc/config/rs6000/tramp.asm
@@ -1,8 +1,6 @@
-/* CYGNUS LOCAL -- waiting for FSF sources to be restored/meissner */
-/*
- * special support for trampolines
+/*  Special support for trampolines
  *
- *   Copyright (C) 1996 Free Software Foundation, Inc.
+ *   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
  *   Written By Michael Meissner
  * 
  * This file is free software; you can redistribute it and/or modify it
@@ -82,7 +80,7 @@ FUNC_START(__trampoline_setup)
         mflr	r11
         lwz	r12,(.LCL0-.LCF0)(r11)
         add	r11,r12,r11
-        lwz	r7,.Ltramp(r11)		/* trampoline addres -4 */
+        lwz	r7,.Ltramp(r11)		/* trampoline address -4 */
 
 	li	r8,__trampoline_size	/* verify that the trampoline is big enough */
 	cmpw	cr1,r8,r4
diff --git a/gcc/config/rs6000/x-rs6000 b/gcc/config/rs6000/x-rs6000
index ecfc0899079..0d8f3113fb5 100644
--- a/gcc/config/rs6000/x-rs6000
+++ b/gcc/config/rs6000/x-rs6000
@@ -1,5 +1,4 @@
 # configuration for IBM rs6000 running aix
-INSTALL=/usr/ucb/install -c
 
 # Show we need to use the C version of ALLOCA
 ALLOCA=alloca.o
diff --git a/gcc/config/rs6000/xm-mach.h b/gcc/config/rs6000/xm-mach.h
index 105a59d67f4..2d4ee5d21ce 100644
--- a/gcc/config/rs6000/xm-mach.h
+++ b/gcc/config/rs6000/xm-mach.h
@@ -1,25 +1,2 @@
-/* Configuration for GNU C-compiler for IBM RS/6000 on MACH.
-   Copyright (C) 1992 Free Software Foundation, Inc.
-   Contributed by Richard Kenner (kenner@nyu.edu).
-
-This file is part of GNU CC.
-
-GNU CC 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 2, or (at your option)
-any later version.
-
-GNU CC 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 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 "rs6000/xm-rs6000.h"
 #undef USG
 #undef COLLECT_EXPORT_LIST