From 3d0d9a538ff8383cf9d8b1e84bc6173f0c0caf14 Mon Sep 17 00:00:00 2001
From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 10 Apr 1999 04:32:43 +0000
Subject: [PATCH] * rs6000/sysv4.h (CPP_OS_LINUX_SPEC): Fix conditions
for -Dunix and -Dlinux, and remove duplicate definition.
Change -Asystem(linux) to -Asystem(posix). (CPP_OS_SOLARIS_SPEC): Fix
conditions for -Dunix, -Dsun, -DSVR4, -D__EXTENSIONS__. *
rs6000/linux.h (CPP_PREDEFINES): Remove -Dunix, -Dlinux,
-Asystem(linux), and -Asystem(unix).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26329 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 11 +++++++++++
gcc/config/rs6000/linux.h | 2 +-
gcc/config/rs6000/sysv4.h | 11 ++++-------
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0022e4a88629..8aad0c73edf0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+Sat Apr 10 05:25:28 1999 Daniel Jacobowitz <dan@debian.org>
+
+ * rs6000/sysv4.h (CPP_OS_LINUX_SPEC): Fix conditions
+ for -Dunix and -Dlinux, and remove duplicate definition.
+ Change -Asystem(linux) to -Asystem(posix).
+ (CPP_OS_SOLARIS_SPEC): Fix conditions for -Dunix, -Dsun,
+ -DSVR4, -D__EXTENSIONS__.
+
+ * rs6000/linux.h (CPP_PREDEFINES): Remove -Dunix,
+ -Dlinux, -Asystem(linux), and -Asystem(unix).
+
Sat Apr 10 05:14:50 1999 Mark Elbrecht <snowball3@usa.net>
* collect2.c (find_a_file): Use HAVE_DOS_BASED_FILE_SYSTEM in place
diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
index 7b3571f75611..ff30618720ee 100644
--- a/gcc/config/rs6000/linux.h
+++ b/gcc/config/rs6000/linux.h
@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA. */
#undef CPP_PREDEFINES
#define CPP_PREDEFINES \
- "-DPPC -D__ELF__ -Dunix -Dlinux -Dpowerpc -Asystem(unix) -Asystem(linux) -Acpu(powerpc) -Amachine(powerpc)"
+ "-DPPC -D__ELF__ -Dpowerpc -Acpu(powerpc) -Amachine(powerpc)"
#undef CPP_OS_DEFAULT_SPEC
#define CPP_OS_DEFAULT_SPEC "%(cpp_os_linux)"
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index e945e80d1973..75729e3f3c22 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -1330,12 +1330,8 @@ do { \
#ifndef CPP_OS_LINUX_SPEC
#define CPP_OS_LINUX_SPEC "-D__unix__ -D__linux__ \
-%{!ansi: -Dunix -Dlinux } \
--Asystem(unix) -Asystem(linux)"
-#endif
-
-#ifndef CPP_OS_LINUX_SPEC
-#define CPP_OS_LINUX_SPEC ""
+%{!undef:%{!ansi:%{!std=*:-Dunix -Dlinux}%{std=gnu*:-Dunix -Dlinux}}}
+-Asystem(unix) -Asystem(posix)"
#endif
/* Solaris support. */
@@ -1389,7 +1385,8 @@ do { \
#ifndef CPP_OS_SOLARIS_SPEC
#define CPP_OS_SOLARIS_SPEC "-D__ppc -D__sun__=1 -D__unix__ -D__svr4__ -D__SVR4__ \
-%{!ansi: -Dsun=1 -Dunix -DSVR4 -D__EXTENSIONS__ } \
+%{!undef:%{!ansi:%{!std=*:-Dsun=1 -Dunix -DSVR4 -D__EXTENSIONS__} \
+ %{std=gnu*:-Dsun=1 -Dunix -DSVR4 -D__EXTENSIONS__}}} \
-Amachine(prep)"
#endif
--
GitLab