sol2.h: Add TARGET_SUB_OS_CPP_BUILTINS.

	* config/sol2.h: Add TARGET_SUB_OS_CPP_BUILTINS.
	* config/sparc/liteelf.h, config/sparc/openbsd64.h,
	config/sparc/rtemself.h, config/sparc/sol2-64.h,
	config/sparc/sp64-elf.h, config/sparc/sp86x-elf.h:
	Update for use of TARGET_SUB_OS_CPP_BUILTINS.

From-SVN: r66905

8 files changed, 21 insertions, 8 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1229391..d15fadc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,13 @@
 2003-05-17  Neil Booth  <neil@daikokuya.co.uk>
 
+	* config/sol2.h: Add TARGET_SUB_OS_CPP_BUILTINS.
+	* config/sparc/liteelf.h, config/sparc/openbsd64.h,
+	config/sparc/rtemself.h, config/sparc/sol2-64.h,
+	config/sparc/sp64-elf.h, config/sparc/sp86x-elf.h:
+	Update for use of TARGET_SUB_OS_CPP_BUILTINS.
+
+2003-05-17  Neil Booth  <neil@daikokuya.co.uk>
+
 	* i960/i960.h, i960/rtems.h: Use TARGET_OS_CPP_BUILTINS and
 	TARGET_CPU_CPP_BUILTINS in preference to CPP_PREDEFINES.
 
diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
index c5980fb..8dfe8e7 100644
--- a/gcc/config/sol2.h
+++ b/gcc/config/sol2.h
@@ -53,6 +53,7 @@ Boston, MA 02111-1307, USA.  */
 "
 
 /* Names to predefine in the preprocessor for this target machine.  */
+#define TARGET_SUB_OS_CPP_BUILTINS()
 #define TARGET_OS_CPP_BUILTINS()			\
     do {						\
 	builtin_define_std ("unix");			\
@@ -62,7 +63,7 @@ Boston, MA 02111-1307, USA.  */
 	builtin_define ("__PRAGMA_REDEFINE_EXTNAME");	\
 	builtin_assert ("system=unix");			\
 	builtin_assert ("system=svr4");			\
-	/* For C++ we need to add some additional macro \
+	/* For C++ we need to add some additional macro	\
 	   definitions required by the C++ standard	\
 	   library.  */					\
 	if (c_language == clk_cplusplus)		\
@@ -72,6 +73,7 @@ Boston, MA 02111-1307, USA.  */
 	    builtin_define ("_LARGEFILE64_SOURCE=1");	\
 	    builtin_define ("__EXTENSIONS__");		\
 	  }						\
+	TARGET_SUB_OS_CPP_BUILTINS();			\
     } while (0)
 
 /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
diff --git a/gcc/config/sparc/liteelf.h b/gcc/config/sparc/liteelf.h
index 04ad6e1..41b49e3 100644
--- a/gcc/config/sparc/liteelf.h
+++ b/gcc/config/sparc/liteelf.h
@@ -19,7 +19,8 @@ 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.  */
 
-#define TARGET_OS_CPP_BUILTINS()		\
+#undef TARGET_SUB_OS_CPP_BUILTINS
+#define TARGET_SUB_OS_CPP_BUILTINS()		\
   do						\
     {						\
 	builtin_define ("__sparclite__");	\
diff --git a/gcc/config/sparc/openbsd64.h b/gcc/config/sparc/openbsd64.h
index 78c2fad..c3d6dfc 100644
--- a/gcc/config/sparc/openbsd64.h
+++ b/gcc/config/sparc/openbsd64.h
@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA.  */
 #define SPARC_DEFAULT_CMODEL CM_MEDMID
 
 /* Target OS builtins.  */
-#undef TARGET_OS_CPP_BUILTINS	 /* Defined in sp64-elf.h.  */
 #define TARGET_OS_CPP_BUILTINS()		\
   do						\
     {						\
diff --git a/gcc/config/sparc/rtemself.h b/gcc/config/sparc/rtemself.h
index 3bd9571..2082929 100644
--- a/gcc/config/sparc/rtemself.h
+++ b/gcc/config/sparc/rtemself.h
@@ -20,7 +20,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /* Target OS builtins.  */
-#define TARGET_OS_CPP_BUILTINS()		\
+#define TARGET_SUB_OS_CPP_BUILTINS()		\
   do						\
     {						\
 	builtin_define_std ("sparc");		\
diff --git a/gcc/config/sparc/sol2-64.h b/gcc/config/sparc/sol2-64.h
index 18e1742..fa04e73 100644
--- a/gcc/config/sparc/sol2-64.h
+++ b/gcc/config/sparc/sol2-64.h
@@ -7,7 +7,8 @@
    MASK_STACK_BIAS + MASK_FPU + MASK_LONG_DOUBLE_128)
 
 /* Target OS builtins.  */
-#define TARGET_OS_CPP_BUILTINS()		\
+#undef TARGET_SUB_OS_CPP_BUILTINS
+#define TARGET_SUB_OS_CPP_BUILTINS()		\
   do						\
     {						\
 	builtin_define_std ("sparc");		\
diff --git a/gcc/config/sparc/sp64-elf.h b/gcc/config/sparc/sp64-elf.h
index 652e7339..5592a6e 100644
--- a/gcc/config/sparc/sp64-elf.h
+++ b/gcc/config/sparc/sp64-elf.h
@@ -38,8 +38,9 @@ Boston, MA 02111-1307, USA.  */
 #undef SPARC_DEFAULT_CMODEL
 #define SPARC_DEFAULT_CMODEL CM_EMBMEDANY
 
-/* Target OS builtins.  */
-#define TARGET_OS_CPP_BUILTINS()		\
+/* Target OS builtins for config/sol.h.  */
+#undef TARGET_SUB_OS_CPP_BUILTINS
+#define TARGET_SUB_OS_CPP_BUILTINS()		\
   do						\
     {						\
 	builtin_define_std ("sparc");		\
diff --git a/gcc/config/sparc/sp86x-elf.h b/gcc/config/sparc/sp86x-elf.h
index 86aa4db..e9e8cdb 100644
--- a/gcc/config/sparc/sp86x-elf.h
+++ b/gcc/config/sparc/sp86x-elf.h
@@ -19,7 +19,8 @@ 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.  */
 
-#define TARGET_OS_CPP_BUILTINS()		\
+#undef  TARGET_SUB_OS_CPP_BUILTINS
+#define TARGET_SUB_OS_CPP_BUILTINS()		\
   do						\
     {						\
 	builtin_define ("__sparclite86x__");	\