@@ -1,11 +1,11 @@
 # Makefile for trampoline
 
 #### Start of system configuration section. ####
 
 HOST = @host@
-CPU = @HOST_CPU_C_ABI@
+CPU = @host_cpu@
 OS = @host_os@
 
 # Directories used by "make":
 srcdir = @srcdir@
 
@@ -15,11 +15,10 @@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
 includedir = @includedir@
 mandir = @mandir@
 datadir = @datadir@
-datarootdir = @datarootdir@
 htmldir = $(datadir)/html
 
 # Programs used by "make":
 CC = @CC@
 CFLAGS = @CFLAGS@
@@ -64,25 +63,19 @@
 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/tramp-hppa.s
 
 tramp-s390.lo : $(srcdir)/tramp-s390.s
 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/tramp-s390.s
 
-tramp-powerpc.lo : tramp-powerpc.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c tramp-powerpc.s
+tramp-rs6000.lo : tramp-rs6000.s
+	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c tramp-rs6000.s
 
-tramp-powerpc.s : $(srcdir)/tramp-powerpc.old.S $(srcdir)/tramp-powerpc.new.S
+tramp-rs6000.s : $(srcdir)/tramp-rs6000.old.S $(srcdir)/tramp-rs6000.new.S
 	case "$(OS)" in \
 	  aix3*) syntax=old;; \
 	  *) syntax=new;; \
 	esac; \
-	$(CPP) $(srcdir)/tramp-powerpc.$${syntax}.S > tramp-powerpc.s
-
-tramp-powerpc64.lo : tramp-powerpc64.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c tramp-powerpc64.s
-
-tramp-powerpc64.s : $(srcdir)/tramp-powerpc64.new.S
-	$(CPP) $(srcdir)/tramp-powerpc64.new.S > tramp-powerpc64.s
+	$(CPP) $(srcdir)/tramp-rs6000.$${syntax}.S > tramp-rs6000.s
 
 tramp-ia64.lo : $(srcdir)/tramp-ia64.s
 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/tramp-ia64.s
 
 cache-sparc.lo : cache-sparc.s
@@ -98,66 +91,55 @@
 	$(CPP) $(ASPFLAGS) $(srcdir)/cache-sparc.S | grep -v '^ *#line' | grep -v '^#' | sed -e 's,% ,%,g' -e 's,//.*$$,,' -e 's,\$$,#,g' > cache-sparc64.s
 
 cache-alpha.lo : $(srcdir)/cache-alpha.s
 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-alpha.s
 
-cache-arm.lo : $(srcdir)/cache-arm.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-arm.s
-
-cache-armel.lo : $(srcdir)/cache-armel.s
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-armel.s
-
 cache-hppa.lo : $(srcdir)/cache-hppa.s
 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-hppa.s
 
-cache-powerpc.lo : $(srcdir)/cache-powerpc-sysv4.s $(srcdir)/cache-powerpc-macos.s
+cache-rs6000.lo : $(srcdir)/cache-rs6000-sysv4.s $(srcdir)/cache-rs6000-macos.s
 	case "$(OS)" in \
 	  macos* | darwin*) syntax=macos;; \
 	  *) syntax=sysv4;; \
 	esac; \
-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-powerpc-$${syntax}.s ; \
-	cp cache-powerpc-$${syntax}.lo cache-powerpc.lo ; rm -f cache-powerpc-$${syntax}.lo ; \
-	if test -f cache-powerpc-$${syntax}.o; then cp cache-powerpc-$${syntax}.o cache-powerpc.o; fi
-# Note that cache-powerpc-${syntax}.o is kept in place, because in some cases
-# cache-powerpc-${syntax}.lo contains a symbolic reference to it and therefore
-# libtool may want to access it.
+	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-rs6000-$${syntax}.s ; mv -f cache-rs6000-$${syntax}.o cache-rs6000.o ; mv -f cache-rs6000-$${syntax}.lo cache-rs6000.lo
 
 cache-convex.lo : $(srcdir)/cache-convex.s
 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-convex.s
 
 libtrampoline.la : $(OBJECTS)
-	$(LIBTOOL_LINK) $(CC) -static -o libtrampoline.la -rpath $(libdir) $(OBJECTS)
+	$(LIBTOOL_LINK) $(CC) -o libtrampoline.la -rpath $(libdir) $(OBJECTS)
 
 # Installs the library and include files only. Typically called with only
 # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
 install-lib : all force
-	mkdir -p $(includedir)
+	if [ ! -d $(includedir) ] ; then mkdir $(includedir) ; fi
 	$(INSTALL_DATA) trampoline_r.h $(includedir)/trampoline_r.h
 
 install : all force
-	mkdir -p $(DESTDIR)$(prefix)
-	mkdir -p $(DESTDIR)$(exec_prefix)
-#	mkdir -p $(DESTDIR)$(libdir)
+	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
+	if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi
+#	if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
 #	$(LIBTOOL_INSTALL) $(INSTALL_DATA) libtrampoline.la $(DESTDIR)$(libdir)/libtrampoline.la
-	mkdir -p $(DESTDIR)$(includedir)
+	if [ ! -d $(DESTDIR)$(includedir) ] ; then mkdir $(DESTDIR)$(includedir) ; fi
 	$(INSTALL_DATA) trampoline_r.h $(DESTDIR)$(includedir)/trampoline_r.h
-	mkdir -p $(DESTDIR)$(mandir)
-	mkdir -p $(DESTDIR)$(mandir)/man3
+	if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
+	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
 	$(INSTALL_DATA) $(srcdir)/trampoline_r.3 $(DESTDIR)$(mandir)/man3/trampoline_r.3
-	mkdir -p $(DESTDIR)$(datadir)
-	mkdir -p $(DESTDIR)$(htmldir)
+	if [ ! -d $(DESTDIR)$(datadir) ] ; then mkdir $(DESTDIR)$(datadir) ; fi
+	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
 	$(INSTALL_DATA) $(srcdir)/trampoline_r.html $(DESTDIR)$(htmldir)/trampoline_r.html
 
 installdirs : force
-	mkdir -p $(DESTDIR)$(prefix)
-	mkdir -p $(DESTDIR)$(exec_prefix)
-#	mkdir -p $(DESTDIR)$(libdir)
-	mkdir -p $(DESTDIR)$(includedir)
-	mkdir -p $(DESTDIR)$(mandir)
-	mkdir -p $(DESTDIR)$(mandir)/man3
-	mkdir -p $(DESTDIR)$(datadir)
-	mkdir -p $(DESTDIR)$(htmldir)
+	if [ ! -d $(DESTDIR)$(prefix) ] ; then mkdir $(DESTDIR)$(prefix) ; fi
+	if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then mkdir $(DESTDIR)$(exec_prefix) ; fi
+#	if [ ! -d $(DESTDIR)$(libdir) ] ; then mkdir $(DESTDIR)$(libdir) ; fi
+	if [ ! -d $(DESTDIR)$(includedir) ] ; then mkdir $(DESTDIR)$(includedir) ; fi
+	if [ ! -d $(DESTDIR)$(mandir) ] ; then mkdir $(DESTDIR)$(mandir) ; fi
+	if [ ! -d $(DESTDIR)$(mandir)/man3 ] ; then mkdir $(DESTDIR)$(mandir)/man3 ; fi
+	if [ ! -d $(DESTDIR)$(datadir) ] ; then mkdir $(DESTDIR)$(datadir) ; fi
+	if [ ! -d $(DESTDIR)$(htmldir) ] ; then mkdir $(DESTDIR)$(htmldir) ; fi
 
 uninstall : force
 #	$(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libtrampoline.la
 	$(RM) $(DESTDIR)$(includedir)/trampoline_r.h
 	$(RM) $(DESTDIR)$(mandir)/man3/trampoline_r.3
@@ -186,15 +168,17 @@
 extracheck : check
 
 mostlyclean : clean
 
 clean : force
-	$(RM) $(OBJECTS) `echo $(OBJECTS) | sed -e 's/\.lo/.o/g'` tramp-powerpc.s cache-sparc.s cache-sparc64.s libtrampoline.* core
+	$(RM) $(OBJECTS) `echo $(OBJECTS) | sed -e 's/\.lo/.o/g'` tramp-rs6000.s cache-sparc.s cache-sparc64.s libtrampoline.* core
 	$(RM) -r .libs _libs
 	$(RM) test1.o test1 test2.o test2
 
 distclean : clean
 	$(RM) config.status config.log config.cache Makefile config.h trampoline_r.h libtool tests.passed.*
 
 maintainer-clean : distclean
 
 force :
+
+