Author: dcoakley
Date: 2012-05-07 03:17:13 -0400 (Mon, 07 May 2012)
New Revision: 3925
Modified:
trunk/Makefile.in
trunk/osprey-gcc-4.2.0/config/acx.m4
trunk/osprey-gcc-4.2.0/configure
trunk/osprey-gcc-4.2.0/gcc/Makefile.in
trunk/osprey-gcc-4.2.0/gcc/configure
trunk/osprey/cygnus/Makefile.in
trunk/osprey/driver/opt_actions.c
Log:
Fix bug 779: build in source directory does not work.
In the osprey-gcc-4.2.0 build always use a known subdirectory for
$(host_subdir) instead of making the choice depending on where configure
was run, so that we always know where to find the build artifacts.
Also in the osprey-gcc 4.2.0 build use a path relative to $(build_objdir)
to find libgspin42.a.
In the build of the cygnus/ld subdirectory, use the "new-ld" target
instead of "all". The "all" target causes unwanted modifications to
checked-in files when the build is being done in the source directory.
For Open64, we only need the new-ld (ipa_link) executable.
Approved by: Sun Chan and Mike Murphy
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2012-05-03 11:53:10 UTC (rev 3924)
+++ trunk/Makefile.in 2012-05-07 07:17:13 UTC (rev 3925)
@@ -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")
Modified: trunk/osprey/cygnus/Makefile.in
===================================================================
--- trunk/osprey/cygnus/Makefile.in 2012-05-03 11:53:10 UTC (rev 3924)
+++ trunk/osprey/cygnus/Makefile.in 2012-05-07 07:17:13 UTC (rev 3925)
@@ -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; \
Modified: trunk/osprey/driver/opt_actions.c
===================================================================
--- trunk/osprey/driver/opt_actions.c 2012-05-03 11:53:10 UTC (rev 3924)
+++ trunk/osprey/driver/opt_actions.c 2012-05-07 07:17:13 UTC (rev 3925)
@@ -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");
Modified: trunk/osprey-gcc-4.2.0/config/acx.m4
===================================================================
--- trunk/osprey-gcc-4.2.0/config/acx.m4 2012-05-03 11:53:10 UTC (rev
3924)
+++ trunk/osprey-gcc-4.2.0/config/acx.m4 2012-05-07 07:17:13 UTC (rev
3925)
@@ -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
Modified: trunk/osprey-gcc-4.2.0/configure
===================================================================
--- trunk/osprey-gcc-4.2.0/configure 2012-05-03 11:53:10 UTC (rev 3924)
+++ trunk/osprey-gcc-4.2.0/configure 2012-05-07 07:17:13 UTC (rev 3925)
@@ -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}
Modified: trunk/osprey-gcc-4.2.0/gcc/Makefile.in
===================================================================
--- trunk/osprey-gcc-4.2.0/gcc/Makefile.in 2012-05-03 11:53:10 UTC (rev
3924)
+++ trunk/osprey-gcc-4.2.0/gcc/Makefile.in 2012-05-07 07:17:13 UTC (rev
3925)
@@ -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
Modified: trunk/osprey-gcc-4.2.0/gcc/configure
===================================================================
--- trunk/osprey-gcc-4.2.0/gcc/configure 2012-05-03 11:53:10 UTC (rev
3924)
+++ trunk/osprey-gcc-4.2.0/gcc/configure 2012-05-07 07:17:13 UTC (rev
3925)
@@ -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}
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Open64-devel mailing list
Open64-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/open64-devel
