Index: osprey/driver/opt_actions.c
===================================================================
--- osprey/driver/opt_actions.c	(revision 3908)
+++ osprey/driver/opt_actions.c	(working copy)
@@ -1167,7 +1167,7 @@
 
 	builddir_len = strlen(builddir);
 	strcpy(new_path, builddir);
-	strcat(new_path, "/osprey-gcc-4.2.0/gcc");
+	strcat(new_path, "/osprey-gcc-4.2.0/host-unknown/gcc");
 	strcat(new_ld_path, ":");
 	strcat(new_ld_path, new_path);
 	override_phase(P_gcpp, "P_gcpp", new_path, "xgcc");
Index: osprey/cygnus/Makefile.in
===================================================================
--- osprey/cygnus/Makefile.in	(revision 3908)
+++ osprey/cygnus/Makefile.in	(working copy)
@@ -12915,7 +12915,8 @@
 .PHONY: all-ld maybe-all-ld
 maybe-all-ld:
 @if ld
-TARGET-ld=all
+# Open64: build only "ld-new" as we do not use anything else.
+TARGET-ld=ld-new
 maybe-all-ld: all-ld
 all-ld: configure-ld
 	@test -f stage_last && exit 0; \
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 3908)
+++ Makefile.in	(working copy)
@@ -45,6 +45,7 @@
 NATIVE_BUILD_DIR    = osprey/targdir
 NATIVE_BUILD_DIR_LD = osprey/cygnus
 GNUFE_BUILD_DIR     = osprey-gcc-4.2.0
+GNUFE_BUILD_SUBDIR  = osprey-gcc-4.2.0/host-unknown
 
 LIB_MACHINE_TYPE    = @LIB_MACHINE_TYPE@
 LIB_BUILD_TARGET    = @LIB_BUILD_TARGET@
@@ -129,8 +130,8 @@
 
 GNU4_FE_COMPONENTS = \
                 $(NATIVE_BUILD_DIR)/wgen/wgen42 \
-                $(GNUFE_BUILD_DIR)/gcc/cc1 \
-                $(GNUFE_BUILD_DIR)/gcc/cc1plus
+                $(GNUFE_BUILD_SUBDIR)/gcc/cc1 \
+                $(GNUFE_BUILD_SUBDIR)/gcc/cc1plus
 
 GNU3_FE_COMPONENTS = \
                 $(NATIVE_BUILD_DIR)/gccfe/gfec \
@@ -328,11 +329,11 @@
 	$(MAKE) -C $(NATIVE_BUILD_DIR)/libspin_4_2_0
 
 # GNU 4.2.0 based FE
-cc1plus: $(GNUFE_BUILD_DIR)/gcc/cc1plus
-cc1: $(GNUFE_BUILD_DIR)/gcc/cc1
+cc1plus: $(GNUFE_BUILD_SUBDIR)/gcc/cc1plus
+cc1: $(GNUFE_BUILD_SUBDIR)/gcc/cc1
 cc1plus: cc1
-$(GNUFE_BUILD_DIR)/gcc/cc1plus cc1plus: $(GNUFE_BUILD_DIR)/gcc/cc1
-$(GNUFE_BUILD_DIR)/gcc/cc1 cc1: $(NATIVE_BUILD_DIR)/libspin_4_2_0/libgspin42.a
+$(GNUFE_BUILD_SUBDIR)/gcc/cc1plus cc1plus: $(GNUFE_BUILD_SUBDIR)/gcc/cc1
+$(GNUFE_BUILD_SUBDIR)/gcc/cc1 cc1: $(NATIVE_BUILD_DIR)/libspin_4_2_0/libgspin42.a
 	$(MAKE) -C $(GNUFE_BUILD_DIR)
 
 build:
@@ -358,25 +359,25 @@
 
 ifeq ($(BUILD_TARGET), PPC32)
 install_fe:
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-common
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-headers
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-cpp
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-driver	    
 else
 install_fe:
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-common
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-headers
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-libgcc
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-cpp
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-driver
 	$(MAKE) -C $(GNUFE_BUILD_DIR)/$(GNUFE_BUILD_HOST)/libstdc++-v3 \
 	    install
@@ -389,17 +390,17 @@
 endif
 install-cross:
 	export TOOLROOT=@prefix@; $(TOP_SRCDIR)/install_compiler.sh ia64-cross $(if $(BUILD_FORTRAN),"YES","NO")
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-common
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-headers
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-libgcc
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-cpp
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/gcc \
 	    install-driver
-	$(MAKE) -C $(GNUFE_BUILD_DIR)/$(GNUFE_BUILD_HOST)/libstdc++-v3 \
+	$(MAKE) -C $(GNUFE_BUILD_SUBDIR)/$(GNUFE_BUILD_HOST)/libstdc++-v3 \
 	    install
 	export TOOLROOT=@prefix@; $(TOP_SRCDIR)/install_compiler.sh ia64-cross $(if $(BUILD_FORTRAN),"YES","NO")
 
Index: osprey-gcc-4.2.0/configure
===================================================================
--- osprey-gcc-4.2.0/configure	(revision 3908)
+++ osprey-gcc-4.2.0/configure	(working copy)
@@ -1025,6 +1025,8 @@
 else
   host_subdir=.
 fi
+# Open64: override the host_subdir to always be the same.
+host_subdir="host-unknown"
 # No prefix.
 target_subdir=${target_noncanonical}
     
Index: osprey-gcc-4.2.0/gcc/configure
===================================================================
--- osprey-gcc-4.2.0/gcc/configure	(revision 3908)
+++ osprey-gcc-4.2.0/gcc/configure	(working copy)
@@ -1553,6 +1553,8 @@
 else
   host_subdir=.
 fi
+# Open64: override the host_subdir to always be the same.
+host_subdir="host-unknown"
 # No prefix.
 target_subdir=${target_noncanonical}
 
Index: osprey-gcc-4.2.0/gcc/Makefile.in
===================================================================
--- osprey-gcc-4.2.0/gcc/Makefile.in	(revision 3908)
+++ osprey-gcc-4.2.0/gcc/Makefile.in	(working copy)
@@ -845,10 +845,8 @@
 # win against random include files in /usr/include.
 ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS)
 
-#LIBGSPIN = ../../../libspin/libgspin42.a
-#This is a symbol link, create by the CONFIGURE script
-#LIBGSPIN = ../../../libspin/libgspin42.a
-LIBGSPIN = ../../osprey/targdir/libspin_4_2_0/libgspin42.a
+# Open64: Location of libgspin42.a, which must already be built.
+LIBGSPIN = $(build_objdir)/../../osprey/targdir/libspin_4_2_0/libgspin42.a
 
 # Build and host support libraries.
 LIBIBERTY = ../libiberty/libiberty.a
@@ -4836,7 +4834,3 @@
 	AWK=$(AWK) $(SHELL) $(srcdir)/po/exgettext \
 		$(XGETTEXT) gcc $(srcdir)
 
-# KEY: rule for making libgspin.a
-# Do not build libspin.a here, it's created by targXXXX_XXXX/CONFIGURE
-#$(LIBGSPIN):
-#	make -C ../../../libspin FE=GNU_4_2_0
Index: osprey-gcc-4.2.0/config/acx.m4
===================================================================
--- osprey-gcc-4.2.0/config/acx.m4	(revision 3908)
+++ osprey-gcc-4.2.0/config/acx.m4	(working copy)
@@ -97,6 +97,8 @@
 else
   host_subdir=.
 fi
+# Open64: override the host_subdir to always be the same.
+host_subdir="host-unknown"
 # No prefix.
 target_subdir=${target_noncanonical}
 AC_SUBST([build_libsubdir]) []dnl