rs6000.h (ASM_OUTPUT_SYMBOL_REF): Move from here ...

	* config/rs6000/rs6000.h (ASM_OUTPUT_SYMBOL_REF): Move from here ...
	* config/rs6000/aix.h (ASM_OUTPUT_SYMBOL_REF): ... to here.
	* config/rs6000/aix51.h (CPLUSCPLUS_CPP_SPEC): Define it.
	(__WCHAR_TYPE__): Correct macro name.

From-SVN: r39547

gcc/ChangeLog

+2001-02-08  David Edelsohn  <edelsohn@gnu.org>
+
+	* config/rs6000/rs6000.h (ASM_OUTPUT_SYMBOL_REF): Move from here ...
+	* config/rs6000/aix.h (ASM_OUTPUT_SYMBOL_REF): ... to here.
+	* config/rs6000/aix51.h (CPLUSCPLUS_CPP_SPEC): Define it.
+	(__WCHAR_TYPE__): Correct macro name.
+	
 2001-02-08  Richard Henderson  <rth@redhat.com>
 
 	* config/i386/i386.c (ix86_frame_pointer_required): New.

gcc/config/rs6000/aix.h

@@ -482,6 +482,11 @@ toc_section ()						\
     xcoffout_declare_function (FILE, DECL, NAME);		\
 }
 
+/* Output a reference to SYM on FILE.  */
+
+#define ASM_OUTPUT_SYMBOL_REF(FILE, SYM) \
+  rs6000_output_symbol_ref (FILE, SYM)
+
 /* This is how to output a reference to a user-level label named NAME.
    `assemble_name' uses this.  */
 

gcc/config/rs6000/aix51.h

@@ -108,13 +108,27 @@ do {									\
 #undef CPP_SPEC
 #define CPP_SPEC "%{posix: -D_POSIX_SOURCE} \
   %{ansi: -D_ANSI_C_SOURCE} \
-  %{!maix64: -D__WCHAR_TYPE="short unsigned int"} \
-  %{maix64: -D__64BIT__ -D_ARCH_PPC -D__WCHAR_TYPE="unsigned int" \
+  %{!maix64: -D__WCHAR_TYPE__="short unsigned int"} \
+  %{maix64: -D__64BIT__ -D_ARCH_PPC -D__WCHAR_TYPE__="unsigned int" \
     -D__LONG_MAX__=9223372036854775807L} \
   %{mpe: -I/usr/lpp/ppe.poe/include} \
   %{pthread: -D_THREAD_SAFE} \
   %(cpp_cpu)"
 
+/* The GNU C++ standard library requires that these macros be 
+   defined.  */
+#undef CPLUSPLUS_CPP_SPEC                       
+#define CPLUSPLUS_CPP_SPEC                      \
+  "-D_XOPEN_SOURCE=500                          \
+   -D_XOPEN_SOURCE_EXTENDED=1                   \
+   -D_LARGE_FILE_API                            \
+   -D_ALL_SOURCE                                \
+   %{maix64: -D__64BIT__ -D_ARCH_PPC -D__WCHAR_TYPE="unsigned int" \
+     -D__LONG_MAX__=9223372036854775807L} \
+   %{mpe: -I/usr/lpp/ppe.poe/include}\
+   %{pthread: -D_THREAD_SAFE}\
+   %(cpp_cpu)"
+
 /* Common CPP definitions used by CPP_SPEC among the various targets
    for handling -mcpu=xxx switches.  */
 #undef CPP_CPU_SPEC

gcc/config/rs6000/rs6000.h

@@ -2628,11 +2628,6 @@ do {									\
 ( (OUTPUT) = (char *) alloca (strlen ((NAME)) + 10),	\
   sprintf ((OUTPUT), "%s.%d", (NAME), (LABELNO)))
 
-/* Output a reference to SYM on FILE.  */
-
-#define ASM_OUTPUT_SYMBOL_REF(FILE, SYM) \
-  rs6000_output_symbol_ref (FILE, SYM)
-
 /* Define the parentheses used to group arithmetic operations
    in assembler code.  */