gcc/
	* Makefile.in (coverage.o): Depend on $(TM_P_H).
	* coverage.c: Include tm_p.h.
	* config/rs6000/x-aix (jc1): Override LDFLAGS.
	* config/rs6000/xcoff.h (ASM_GENERATE_INTERNAL_LABEL): Strip
	dollar signs from PREFIX.
	* config/rs6000/rs6000.c (output_toc): Use RS6000_OUTPUT_BASENAME
	instead of manual strip_name_encoding2.

java/
	* Makefile.in (class.o): Depend on $(TM_P_H).
	(expr.o): Same.
	* class.c: Include tm_p.h.
	* expr.c: Include tm_p.h.


Index: Makefile.in
===================================================================
--- Makefile.in	(revision 141136)
+++ Makefile.in	(working copy)
@@ -2651,7 +2651,7 @@
 coverage.o : coverage.c $(GCOV_IO_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h \
    $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) \
    $(FUNCTION_H) $(TOPLEV_H) $(GGC_H) langhooks.h $(COVERAGE_H) gt-coverage.h \
-   $(HASHTAB_H) tree-iterator.h $(CGRAPH_H) tree-pass.h gcov-io.c
+   $(HASHTAB_H) tree-iterator.h $(CGRAPH_H) tree-pass.h gcov-io.c $(TM_P_H)
 cselib.o : cselib.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \
    $(REGS_H) hard-reg-set.h $(FLAGS_H) $(REAL_H) insn-config.h $(RECOG_H) \
    $(EMIT_RTL_H) $(TOPLEV_H) output.h $(FUNCTION_H) cselib.h $(GGC_H) $(TM_P_H) \
Index: coverage.c
===================================================================
--- coverage.c	(revision 141136)
+++ coverage.c	(working copy)
@@ -38,6 +38,7 @@
 #include "expr.h"
 #include "function.h"
 #include "toplev.h"
+#include "tm_p.h"
 #include "ggc.h"
 #include "coverage.h"
 #include "langhooks.h"
Index: java/class.c
===================================================================
--- java/class.c	(revision 141136)
+++ java/class.c	(working copy)
@@ -38,6 +38,7 @@
 #include "output.h"
 #include "parse.h"
 #include "function.h"
+#include "tm_p.h"
 #include "ggc.h"
 #include "stdio.h"
 #include "target.h"
Index: java/Make-lang.in
===================================================================
--- java/Make-lang.in	(revision 141136)
+++ java/Make-lang.in	(working copy)
@@ -256,7 +256,7 @@
   gt-java-builtins.h
 java/class.o: java/class.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(JAVA_TREE_H) $(RTL_H) java/jcf.h java/parse.h toplev.h output.h $(GGC_H) \
-  $(TARGET_H) $(FUNCTION_H) gt-java-class.h $(CGRAPH_H)
+  $(TARGET_H) $(FUNCTION_H) gt-java-class.h $(CGRAPH_H) $(TM_P_H)
 java/constants.o: java/constants.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
   toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) gt-java-constants.h
 java/decl.o: java/decl.c $(CONFIG_H) $(JAVA_TREE_H) $(RTL_H) java/jcf.h \
@@ -270,7 +270,7 @@
   $(RTL_H) $(EXPR_H) java/javaop.h java/java-opcodes.h except.h \
   java/java-except.h java/java-except.h java/parse.h toplev.h \
   $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) gt-java-expr.h $(TARGET_H) \
-  tree-iterator.h
+  tree-iterator.h $(TM_P_H)
 java/jcf-depend.o: java/jcf-depend.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
   $(TM_H) java/jcf.h
 java/jcf-parse.o: java/jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) $(FLAGS_H) \
Index: java/expr.c
===================================================================
--- java/expr.c	(revision 141136)
+++ java/expr.c	(working copy)
@@ -41,6 +41,7 @@
 #include "parse.h"
 #include "toplev.h"
 #include "except.h"
+#include "tm_p.h"
 #include "ggc.h"
 #include "tree-iterator.h"
 #include "gimple.h"
Index: config/rs6000/x-aix
===================================================================
--- config/rs6000/x-aix	(revision 141136)
+++ config/rs6000/x-aix	(working copy)
@@ -1,3 +1,6 @@
 # genautomata requires more than 256MB of data
 build/genautomata : override LDFLAGS += -Wl,-bmaxdata:0x20000000
 
+# jc1 requires more than 256MB of data
+jc1 : override LDFLAGS += -Wl,-bmaxdata:0x20000000
+
Index: config/rs6000/xcoff.h
===================================================================
--- config/rs6000/xcoff.h	(revision 141136)
+++ config/rs6000/xcoff.h	(working copy)
@@ -257,7 +257,7 @@
    This is suitable for output with `assemble_name'.  */
 
 #define ASM_GENERATE_INTERNAL_LABEL(LABEL,PREFIX,NUM)	\
-  sprintf (LABEL, "*%s..%u", (PREFIX), (unsigned) (NUM))
+  sprintf (LABEL, "*%s..%u", rs6000_xcoff_strip_dollar (PREFIX), (unsigned) (NUM))
 
 /* This is how to output an assembler line to define N characters starting
    at P to FILE.  */
Index: config/rs6000/rs6000.c
===================================================================
--- config/rs6000/rs6000.c	(revision 141136)
+++ config/rs6000/rs6000.c	(working copy)
@@ -18097,7 +18097,6 @@
 {
   char buf[256];
   const char *name = buf;
-  const char *real_name;
   rtx base = x;
   HOST_WIDE_INT offset = 0;
 
@@ -18371,12 +18370,12 @@
       gcc_unreachable ();
     }
 
-  real_name = (*targetm.strip_name_encoding) (name);
   if (TARGET_MINIMAL_TOC)
     fputs (TARGET_32BIT ? "\t.long " : DOUBLE_INT_ASM_OP, file);
   else
     {
-      fprintf (file, "\t.tc %s", real_name);
+      fputs ("\t.tc ", file);
+      RS6000_OUTPUT_BASENAME (file, name);
 
       if (offset < 0)
 	fprintf (file, ".N" HOST_WIDE_INT_PRINT_UNSIGNED, - offset);