]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
projects / thirdparty / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 373b9e7)
re PR other/54279 (first stage build with g++ fails with "." as the first component...
authorAndrew Pinski <apinski@cavium.com>
Wed, 28 Nov 2012 22:11:29 +0000 (22:11 +0000)
committerAndrew Pinski <pinskia@gcc.gnu.org>
Wed, 28 Nov 2012 22:11:29 +0000 (14:11 -0800)
2012-11-28  Andrew Pinski  <apinski@cavium.com>

        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  <apinski@cavium.com>

        PR bootstrap/54279
        * Makefile.in (${QMTEST_DIR}/context): Use xg++ instead of g++.

2012-11-28  Andrew Pinski  <apinski@cavium.com>

        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  <apinski@cavium.com>

        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  <apinski@cavium.com>

        PR bootstrap/54279
        * scripts/testsuite_flags.in (--build-cxx): Use xg++ instead of g++.
        * testsuite/lib/libstdc++.exp (libstdc++_init): Likewise.

From-SVN: r193910

15 files changed:
ChangeLog patch | blob | blame | history
Makefile.in patch | blob | blame | history
Makefile.tpl patch | blob | blame | history
configure patch | blob | blame | history
configure.ac patch | blob | blame | history
gcc/ChangeLog patch | blob | blame | history
gcc/Makefile.in patch | blob | blame | history
gcc/cp/ChangeLog patch | blob | blame | history
gcc/cp/Make-lang.in patch | blob | blame | history
gcc/testsuite/ChangeLog patch | blob | blame | history
gcc/testsuite/lib/g++.exp patch | blob | blame | history
gcc/testsuite/lib/obj-c++.exp patch | blob | blame | history
libstdc++-v3/ChangeLog patch | blob | blame | history
libstdc++-v3/scripts/testsuite_flags.in patch | blob | blame | history
libstdc++-v3/testsuite/lib/libstdc++.exp patch | blob | blame | history

diff --git a/ChangeLog b/ChangeLog
index 6c0d6d60399d22497e81e63278db323491c07e3a..aba7edfc3018ffd466f48d51138b68c1e52bdf89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-28  Andrew Pinski  <apinski@cavium.com>
+
+       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  <siddhesh@redhat.com>
 
        * configure.ac: Disable libsanitizer if we're not building C++.
diff --git a/Makefile.in b/Makefile.in
index 636b2ba18e9ca95fd20704c0f5152f141a3b89af..48202537f074c16aa5e5b52106ec76f1e04d71fb 100644 (file)
--- 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 146666a4517c71fc7f36315c32362fd099d6161d..5cdc119d9b1e3b62e264058ffa94c44eba2a6571 100644 (file)
--- 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 16bbaa82bedf3950e9c2fdc1f8d6aac3f2ad7a3e..b58860ff3b29f82ecc5ddd64d4aa9ae97c573bf9 100755 (executable)
--- 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 cd6721e45945e492a9f4dd0e78f593012c19122d..49f4f5dae887282819a7c7f6711095f029d36852 100644 (file)
--- 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 b4febea6753a342d02d91d296c5ae1699c6ff1e2..210844d42bf97e1580c879b7d819315086818c70 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-28  Andrew Pinski  <apinski@cavium.com>
+
+       PR bootstrap/54279
+       * Makefile.in (${QMTEST_DIR}/context): Use xg++ instead of g++.
+
 2012-11-28  Richard Sandiford  <rdsandiford@googlemail.com>
 
        PR rtl-optimization/55052
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 8c78eda61ea47887d890e67d9e7c2feb2d3b8039..c7b86482383f878b52ebd45eae420898d864c441 100644 (file)
--- 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 edb45f4df10dcec06cb7013d073236a8bfc1c2fa..8c30eaae87e06ccd10a93f973befcb80300e7e8e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2012-11-28  Andrew Pinski  <apinski@cavium.com>
+
+       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  <paolo.carlini@oracle.com>
 
        PR c++/55446
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 9d92f648bee14193ed52c80b0aee90aed6eb3572..13abaf9ab33c4438c00a9eb721bff4ae935ee535 100644 (file)
--- 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 76ce7ff09bbfc871aa3e0b40602da4a30e5afa08..309d54cdf87e69665a34ce4689329596af8049e0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-28  Andrew Pinski  <apinski@cavium.com>
+
+       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  <burnus@net-b.de>
 
        PR fortran/52161
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index ff111253f125a36c837224dbca28bbe0d25f06c7..7fd36dabe75ac276177801d08e552a92bf09c981 100644 (file)
--- 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 8c190cd2f58f0bf539448da7e81fc8d812658f1e..773b7c9e8125e333b95fac2a58dbeb9c33c22184 100644 (file)
--- 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 ac1e7cbd602bd7301469f459d6b14f4d7aa385c3..b5d9fbd9d9c2b1ab8586123a8b68def70a51ee8f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-28  Andrew Pinski  <apinski@cavium.com>
+
+       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  <jwakely.gcc@gmail.com>
 
        * 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 f77784bd7b93f5d76d58cb3b1ba2e53f39cbb71d..d7710ca70ec389df3ff4ef683217c3180f84c37a 100755 (executable)
--- 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 adb9c157586d17d2bedfe3436924bef24a25f221..b3be88fc5e32986a01378d9f28a31ca486688f37 100644 (file)
--- 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"
 
Mirror of https://gcc.gnu.org/git/gcc.git