From: Andrew Pinski Date: Wed, 28 Nov 2012 22:11:29 +0000 (+0000) Subject: re PR other/54279 (first stage build with g++ fails with "." as the first component... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5d99894e654b30324d5ab24069159ff9bc853c6a;p=gcc.git re PR other/54279 (first stage build with g++ fails with "." as the first component of $PATH) 2012-11-28 Andrew Pinski PR bootstrap/54279 * configure.ac (CXX_FOR_TARGET): Change over to use xg++. * configure: Regenerate. * Makefile.tpl (POSTSTAGE1_CXX_EXPORT): Change over to use xg++. * Makefile.in: Regenerate. 2012-11-28 Andrew Pinski PR bootstrap/54279 * Makefile.in (${QMTEST_DIR}/context): Use xg++ instead of g++. 2012-11-28 Andrew Pinski PR bootstrap/54279 * Make-lang.in (g++$(exeext)): Rename to (xg++$(exeext)): This. (g++-cross$(exeext)): Use xg++$(exeext) instead of g++$(exeext). (c++.start.encap): Likewise. (c++.install-common): Likewise. 2012-11-28 Andrew Pinski PR bootstrap/54279 * lib/g++.exp (g++_init): Search for xg++ instead of g++ in the build directories. * lib/obj-c++.exp (obj-c++_init): Likewise. 2012-11-28 Andrew Pinski PR bootstrap/54279 * scripts/testsuite_flags.in (--build-cxx): Use xg++ instead of g++. * testsuite/lib/libstdc++.exp (libstdc++_init): Likewise. From-SVN: r193910 --- diff --git a/ChangeLog b/ChangeLog index 6c0d6d60399..aba7edfc301 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-11-28 Andrew Pinski + + PR bootstrap/54279 + * configure.ac (CXX_FOR_TARGET): Change over to use xg++. + * configure: Regenerate. + * Makefile.tpl (POSTSTAGE1_CXX_EXPORT): Change over to use xg++. + * Makefile.in: Regenerate. + 2012-11-27 Siddhesh Poyarekar * configure.ac: Disable libsanitizer if we're not building C++. diff --git a/Makefile.in b/Makefile.in index 636b2ba18e9..48202537f07 100644 --- a/Makefile.in +++ b/Makefile.in @@ -235,7 +235,7 @@ POSTSTAGE1_CXX_EXPORT = \ @if target-libstdc++-v3-bootstrap # Override the above if we're bootstrapping C++. POSTSTAGE1_CXX_EXPORT = \ - CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/g++$(exeext) \ + CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xg++$(exeext) \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \ -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ diff --git a/Makefile.tpl b/Makefile.tpl index 146666a4517..5cdc119d9b1 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -238,7 +238,7 @@ POSTSTAGE1_CXX_EXPORT = \ @if target-libstdc++-v3-bootstrap # Override the above if we're bootstrapping C++. POSTSTAGE1_CXX_EXPORT = \ - CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/g++$(exeext) \ + CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xg++$(exeext) \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \ -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ diff --git a/configure b/configure index 16bbaa82bed..b58860ff3b2 100755 --- a/configure +++ b/configure @@ -13628,7 +13628,7 @@ else esac if test $ok = yes; then # An in-tree tool is available and we can use it - CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' + CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5 $as_echo "just compiled" >&6; } elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then diff --git a/configure.ac b/configure.ac index cd6721e4594..49f4f5dae88 100644 --- a/configure.ac +++ b/configure.ac @@ -3129,7 +3129,7 @@ GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new]) GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/]) dnl see comments for CXX_FOR_TARGET_FLAG_TO_PASS GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX, - [gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs], + [gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs], c++) GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX, [gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs], diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b4febea6753..210844d42bf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-11-28 Andrew Pinski + + PR bootstrap/54279 + * Makefile.in (${QMTEST_DIR}/context): Use xg++ instead of g++. + 2012-11-28 Richard Sandiford PR rtl-optimization/55052 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 8c78eda61ea..c7b86482383 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -5184,7 +5184,7 @@ ${QMTEST_DIR}/context: stamp-qmtest echo "CompilerTable.c_path=${objdir}/xgcc" >> $@ echo "CompilerTable.c_options=-B${objdir}/" >> $@ echo "CompilerTable.cplusplus_kind=GCC" >> $@ - echo "CompilerTable.cplusplus_path=${objdir}/g++" >> $@ + echo "CompilerTable.cplusplus_path=${objdir}/xg++" >> $@ echo "CompilerTable.cplusplus_options=-B${objdir}/" >> $@ echo "DejaGNUTest.target=${target_noncanonical}" >> $@ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index edb45f4df10..8c30eaae87e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2012-11-28 Andrew Pinski + + PR bootstrap/54279 + * Make-lang.in (g++$(exeext)): Rename to + (xg++$(exeext)): This. + (g++-cross$(exeext)): Use xg++$(exeext) instead of g++$(exeext). + (c++.start.encap): Likewise. + (c++.install-common): Likewise. + 2012-11-24 Paolo Carlini PR c++/55446 diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 9d92f648bee..13abaf9ab33 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -61,15 +61,15 @@ g++spec.o: $(srcdir)/cp/g++spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) \ # Create the compiler driver for g++. GXX_OBJS = $(GCC_OBJS) g++spec.o -g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS) +xg++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS) +$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a \ $(EXTRA_GCC_LIBS) $(LIBS) # Create a version of the g++ driver which calls the cross-compiler. -g++-cross$(exeext): g++$(exeext) +g++-cross$(exeext): xg++$(exeext) -rm -f g++-cross$(exeext) - cp g++$(exeext) g++-cross$(exeext) + cp xg++$(exeext) g++-cross$(exeext) # The compiler itself. # Shared with C front end: @@ -124,7 +124,7 @@ endif # Build hooks: c++.all.cross: g++-cross$(exeext) -c++.start.encap: g++$(exeext) +c++.start.encap: xg++$(exeext) c++.rest.encap: c++.info: c++.install-info: @@ -172,7 +172,7 @@ check_g++_parallelize = old-deja.exp dg.exp dg-torture.exp # and also as either g++ (if native) or $(tooldir)/bin/g++. c++.install-common: installdirs -rm -f $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) - -$(INSTALL_PROGRAM) g++$(exeext) $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) + -$(INSTALL_PROGRAM) xg++$(exeext) $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) -chmod a+x $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) -rm -f $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext) -( cd $(DESTDIR)$(bindir) && \ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 76ce7ff09bb..309d54cdf87 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2012-11-28 Andrew Pinski + + PR bootstrap/54279 + * lib/g++.exp (g++_init): Search for xg++ instead of g++ in the build + directories. + * lib/obj-c++.exp (obj-c++_init): Likewise. + 2012-11-28 Tobias Burnus PR fortran/52161 diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index ff111253f12..7fd36dabe75 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -210,7 +210,7 @@ proc g++_init { args } { if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } { set GXX_UNDER_TEST [transform c++] } else { - set GXX_UNDER_TEST [findfile $base_dir/../../g++ "$base_dir/../../g++ -B$base_dir/../../" [findfile $base_dir/g++ "$base_dir/g++ -B$base_dir/" [transform c++]]] + set GXX_UNDER_TEST [findfile $base_dir/../../xg++ "$base_dir/../../xg++ -B$base_dir/../../" [findfile $base_dir/xg++ "$base_dir/xg++ -B$base_dir/" [transform c++]]] } } } diff --git a/gcc/testsuite/lib/obj-c++.exp b/gcc/testsuite/lib/obj-c++.exp index 8c190cd2f58..773b7c9e812 100644 --- a/gcc/testsuite/lib/obj-c++.exp +++ b/gcc/testsuite/lib/obj-c++.exp @@ -221,7 +221,7 @@ proc obj-c++_init { args } { if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } { set OBJCXX_UNDER_TEST [transform c++] } else { - set OBJCXX_UNDER_TEST [findfile $base_dir/../../g++ "$base_dir/../../g++ -B$base_dir/../../" [findfile $base_dir/g++ "$base_dir/g++ -B$base_dir/" [transform c++]]] + set OBJCXX_UNDER_TEST [findfile $base_dir/../../xg++ "$base_dir/../../xg++ -B$base_dir/../../" [findfile $base_dir/xg++ "$base_dir/xg++ -B$base_dir/" [transform c++]]] } } } diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ac1e7cbd602..b5d9fbd9d9c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2012-11-28 Andrew Pinski + + PR bootstrap/54279 + * scripts/testsuite_flags.in (--build-cxx): Use xg++ instead of g++. + * testsuite/lib/libstdc++.exp (libstdc++_init): Likewise. + 2012-11-28 Jonathan Wakely * include/std/functional (_Mem_fn): Constrain function call operators diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in index f77784bd7b9..d7710ca70ec 100755 --- a/libstdc++-v3/scripts/testsuite_flags.in +++ b/libstdc++-v3/scripts/testsuite_flags.in @@ -45,7 +45,7 @@ case ${query} in ;; --build-cxx) CXX_build="@CXX@" - CXX=`echo "$CXX_build" | sed 's,gcc/xgcc ,gcc/g++ ,'` + CXX=`echo "$CXX_build" | sed 's,gcc/xgcc ,gcc/xg++ ,'` echo ${CXX} ;; --build-cc) diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index adb9c157586..b3be88fc5e3 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -181,7 +181,7 @@ proc libstdc++_init { testfile } { # Compute what needs to be added to the existing LD_LIBRARY_PATH. if {$gccdir != ""} { - set compiler ${gccdir}/g++ + set compiler ${gccdir}/xg++ set ld_library_path ${ld_library_path_tmp} append ld_library_path ":${blddir}/src/.libs"