- move a few common pieces into OPENBSD_OS_CPP_BUILTINS_COMMON

- add __LP64__ to OPENBSD_OS_CPP_BUILTINS_LP64
- add __sparc to TARGET_OS_CPP_BUILTINS for sparc64
- add __PPC, __PPC__ and __powerpc to TARGET_OS_CPP_BUILTINS for powerpc

ok espie@

7 files changed, 19 insertions, 27 deletions

diff --git a/gnu/usr.bin/gcc/gcc/config/alpha/openbsd.h b/gnu/usr.bin/gcc/gcc/config/alpha/openbsd.h
index ea93053a354..e001abecdb2 100644
--- a/gnu/usr.bin/gcc/gcc/config/alpha/openbsd.h
+++ b/gnu/usr.bin/gcc/gcc/config/alpha/openbsd.h
@@ -44,11 +44,8 @@ Boston, MA 02111-1307, USA.  */
 /* run-time target specifications */
 #define TARGET_OS_CPP_BUILTINS()		\
     do {					\
-	builtin_define ("__OpenBSD__");		\
-	builtin_define ("__ANSI_COMPAT");	\
-	builtin_define ("__unix__");		\
-	builtin_define ("__ELF__");		\
-	builtin_assert ("system=unix");		\
+	OPENBSD_OS_CPP_BUILTINS_ELF();		\
+	OPENBSD_OS_CPP_BUILTINS_LP64();		\
     } while (0)
 
 /* Layout of source language data types.  */
diff --git a/gnu/usr.bin/gcc/gcc/config/i386/openbsd.h b/gnu/usr.bin/gcc/gcc/config/i386/openbsd.h
index 95bab6ceb8f..fb04c4e6d6c 100644
--- a/gnu/usr.bin/gcc/gcc/config/i386/openbsd.h
+++ b/gnu/usr.bin/gcc/gcc/config/i386/openbsd.h
@@ -30,11 +30,6 @@ Boston, MA 02111-1307, USA.  */
   do						\
     {						\
     	OPENBSD_OS_CPP_BUILTINS_COMMON();	\
-	builtin_define ("__unix__");		\
-	builtin_define ("__OpenBSD__");		\
-	builtin_assert ("system=unix");		\
-	builtin_assert ("system=bsd");		\
-	builtin_assert ("system=OpenBSD");	\
     }						\
   while (0)
 
diff --git a/gnu/usr.bin/gcc/gcc/config/i386/openbsdelf.h b/gnu/usr.bin/gcc/gcc/config/i386/openbsdelf.h
index 7e97f0daee5..b1c5d40590d 100644
--- a/gnu/usr.bin/gcc/gcc/config/i386/openbsdelf.h
+++ b/gnu/usr.bin/gcc/gcc/config/i386/openbsdelf.h
@@ -39,8 +39,6 @@ Boston, MA 02111-1307, USA.  */
   do						\
     {						\
     	OPENBSD_OS_CPP_BUILTINS_ELF();		\
-	builtin_define ("__unix__");		\
-	builtin_assert ("system=bsd");		\
     }						\
   while (0)
 
diff --git a/gnu/usr.bin/gcc/gcc/config/openbsd.h b/gnu/usr.bin/gcc/gcc/config/openbsd.h
index 4f83891cf37..78501ac3470 100644
--- a/gnu/usr.bin/gcc/gcc/config/openbsd.h
+++ b/gnu/usr.bin/gcc/gcc/config/openbsd.h
@@ -81,7 +81,10 @@ Boston, MA 02111-1307, USA.  */
   do						\
     {						\
       builtin_define ("__OpenBSD__");		\
+      builtin_define ("__unix__");		\
+      builtin_define ("__ANSI_COMPAT");		\
       builtin_assert ("system=unix");		\
+      builtin_assert ("system=bsd");		\
       builtin_assert ("system=OpenBSD");	\
     }						\
   while (0)
@@ -100,6 +103,7 @@ Boston, MA 02111-1307, USA.  */
   do						\
     {						\
       builtin_define ("_LP64");			\
+      builtin_define ("__LP64__");		\
     }						\
   while (0)
 
diff --git a/gnu/usr.bin/gcc/gcc/config/pa/openbsd.h b/gnu/usr.bin/gcc/gcc/config/pa/openbsd.h
index 8d3ede55273..df983fd1394 100644
--- a/gnu/usr.bin/gcc/gcc/config/pa/openbsd.h
+++ b/gnu/usr.bin/gcc/gcc/config/pa/openbsd.h
@@ -33,16 +33,11 @@ Boston, MA 02111-1307, USA.  */
 
 /* Run-time target specifications. */
 #undef TARGET_OS_CPP_BUILTINS
-#define TARGET_OS_CPP_BUILTINS()				\
-  do								\
-    {								\
-	builtin_define_std ("__ELF__");				\
-	builtin_define_std ("__ANSI_COMPAT");			\
-	builtin_define_std ("__unix__");			\
-	builtin_define_std ("__OpenBSD__");			\
-	builtin_assert ("system=OpenBSD");			\
-	builtin_assert ("system=unix");				\
-    }								\
+#define TARGET_OS_CPP_BUILTINS()		\
+  do						\
+    {						\
+	OPENBSD_OS_CPP_BUILTINS_ELF();		\
+    }						\
   while (0)
 
 
diff --git a/gnu/usr.bin/gcc/gcc/config/rs6000/openbsd.h b/gnu/usr.bin/gcc/gcc/config/rs6000/openbsd.h
index 89444cf017a..e0c18280072 100644
--- a/gnu/usr.bin/gcc/gcc/config/rs6000/openbsd.h
+++ b/gnu/usr.bin/gcc/gcc/config/rs6000/openbsd.h
@@ -25,11 +25,13 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_OS_CPP_BUILTINS()		\
   do						\
     {						\
-      OPENBSD_OS_CPP_BUILTINS_ELF();		\
-      builtin_define ("__powerpc__");		\
-      builtin_define ("__unix__");		\
-      builtin_assert ("cpu=powerpc");		\
-      builtin_assert ("machine=powerpc");	\
+	OPENBSD_OS_CPP_BUILTINS_ELF();		\
+	builtin_define ("__PPC");		\
+	builtin_define ("__PPC__");		\
+	builtin_define ("__powerpc");		\
+	builtin_define ("__powerpc__");		\
+	builtin_assert ("cpu=powerpc");		\
+	builtin_assert ("machine=powerpc");	\
     }						\
   while (0)
 
diff --git a/gnu/usr.bin/gcc/gcc/config/sparc/openbsd64.h b/gnu/usr.bin/gcc/gcc/config/sparc/openbsd64.h
index e5386f16348..41854c7e548 100644
--- a/gnu/usr.bin/gcc/gcc/config/sparc/openbsd64.h
+++ b/gnu/usr.bin/gcc/gcc/config/sparc/openbsd64.h
@@ -40,6 +40,7 @@ Boston, MA 02111-1307, USA.  */
       builtin_define ("__sparc_v9__");			\
       builtin_define ("__sparcv9__");			\
       builtin_define ("__arch64__");			\
+      builtin_define ("__sparc");			\
       builtin_define ("__sparc__");			\
     }							\
   while (0)