View | Details | Return to bug 54279
Collapse All | Expand All

(-)Makefile.in (-1 / +1 lines)
Lines 235-241 POSTSTAGE1_CXX_EXPORT = \ Link Here
235
@if target-libstdc++-v3-bootstrap
235
@if target-libstdc++-v3-bootstrap
236
# Override the above if we're bootstrapping C++.
236
# Override the above if we're bootstrapping C++.
237
POSTSTAGE1_CXX_EXPORT = \
237
POSTSTAGE1_CXX_EXPORT = \
238
	CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/g++$(exeext) \
238
	CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xg++$(exeext) \
239
	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
239
	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
240
	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
240
	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
241
	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
241
	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
(-)configure.ac (-1 / +1 lines)
Lines 3129-3135 GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [ Link Here
3129
GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
3129
GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
3130
dnl see comments for CXX_FOR_TARGET_FLAG_TO_PASS
3130
dnl see comments for CXX_FOR_TARGET_FLAG_TO_PASS
3131
GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX,
3131
GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX,
3132
		[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],
3132
		[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],
3133
		c++)
3133
		c++)
3134
GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
3134
GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
3135
		[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],
3135
		[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],
(-)configure (-1 / +1 lines)
Lines 13628-13634 else Link Here
13628
  esac
13628
  esac
13629
  if test $ok = yes; then
13629
  if test $ok = yes; then
13630
    # An in-tree tool is available and we can use it
13630
    # An in-tree tool is available and we can use it
13631
    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'
13631
    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'
13632
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
13632
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
13633
$as_echo "just compiled" >&6; }
13633
$as_echo "just compiled" >&6; }
13634
  elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
13634
  elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
(-)gcc/testsuite/lib/g++.exp (-1 / +1 lines)
Lines 210-216 proc g++_init { args } { Link Here
210
	    if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
210
	    if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
211
		set GXX_UNDER_TEST [transform c++]
211
		set GXX_UNDER_TEST [transform c++]
212
	    } else {
212
	    } else {
213
		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++]]]
213
		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++]]]
214
	    }
214
	    }
215
	}
215
	}
216
    }
216
    }
(-)gcc/testsuite/lib/obj-c++.exp (-1 / +1 lines)
Lines 221-227 proc obj-c++_init { args } { Link Here
221
	    if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
221
	    if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
222
		set OBJCXX_UNDER_TEST [transform c++]
222
		set OBJCXX_UNDER_TEST [transform c++]
223
	    } else {
223
	    } else {
224
		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++]]]
224
		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++]]]
225
	    }
225
	    }
226
	}
226
	}
227
    }
227
    }
(-)gcc/cp/Make-lang.in (-5 / +5 lines)
Lines 61-75 g++spec.o: $(srcdir)/cp/g++spec.c $(SYST Link Here
61
61
62
# Create the compiler driver for g++.
62
# Create the compiler driver for g++.
63
GXX_OBJS = $(GCC_OBJS) g++spec.o
63
GXX_OBJS = $(GCC_OBJS) g++spec.o
64
g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS)
64
xg++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS)
65
	+$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \
65
	+$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \
66
	  $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a \
66
	  $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a \
67
	  $(EXTRA_GCC_LIBS) $(LIBS)
67
	  $(EXTRA_GCC_LIBS) $(LIBS)
68
68
69
# Create a version of the g++ driver which calls the cross-compiler.
69
# Create a version of the g++ driver which calls the cross-compiler.
70
g++-cross$(exeext): g++$(exeext)
70
g++-cross$(exeext): xg++$(exeext)
71
	-rm -f g++-cross$(exeext)
71
	-rm -f g++-cross$(exeext)
72
	cp g++$(exeext) g++-cross$(exeext)
72
	cp xg++$(exeext) g++-cross$(exeext)
73
73
74
# The compiler itself.
74
# The compiler itself.
75
# Shared with C front end:
75
# Shared with C front end:
Lines 124-130 endif Link Here
124
# Build hooks:
124
# Build hooks:
125
125
126
c++.all.cross: g++-cross$(exeext)
126
c++.all.cross: g++-cross$(exeext)
127
c++.start.encap: g++$(exeext)
127
c++.start.encap: xg++$(exeext)
128
c++.rest.encap:
128
c++.rest.encap:
129
c++.info:
129
c++.info:
130
c++.install-info:
130
c++.install-info:
Lines 172-178 check_g++_parallelize = old-deja.exp dg. Link Here
172
# and also as either g++ (if native) or $(tooldir)/bin/g++.
172
# and also as either g++ (if native) or $(tooldir)/bin/g++.
173
c++.install-common: installdirs
173
c++.install-common: installdirs
174
	-rm -f $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext)
174
	-rm -f $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext)
175
	-$(INSTALL_PROGRAM) g++$(exeext) $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext)
175
	-$(INSTALL_PROGRAM) xg++$(exeext) $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext)
176
	-chmod a+x $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext)
176
	-chmod a+x $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext)
177
	-rm -f $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext)
177
	-rm -f $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext)
178
	-( cd $(DESTDIR)$(bindir) && \
178
	-( cd $(DESTDIR)$(bindir) && \
(-)gcc/Makefile.in (-1 / +1 lines)
Lines 5173-5179 ${QMTEST_DIR}/context: stamp-qmtest Link Here
5173
	echo "CompilerTable.c_path=${objdir}/xgcc" >> $@
5173
	echo "CompilerTable.c_path=${objdir}/xgcc" >> $@
5174
	echo "CompilerTable.c_options=-B${objdir}/" >> $@
5174
	echo "CompilerTable.c_options=-B${objdir}/" >> $@
5175
	echo "CompilerTable.cplusplus_kind=GCC" >> $@
5175
	echo "CompilerTable.cplusplus_kind=GCC" >> $@
5176
	echo "CompilerTable.cplusplus_path=${objdir}/g++" >> $@
5176
	echo "CompilerTable.cplusplus_path=${objdir}/xg++" >> $@
5177
	echo "CompilerTable.cplusplus_options=-B${objdir}/" >> $@
5177
	echo "CompilerTable.cplusplus_options=-B${objdir}/" >> $@
5178
	echo "DejaGNUTest.target=${target_noncanonical}" >> $@
5178
	echo "DejaGNUTest.target=${target_noncanonical}" >> $@
5179
5179
(-)Makefile.tpl (-1 / +1 lines)
Lines 238-244 POSTSTAGE1_CXX_EXPORT = \ Link Here
238
@if target-libstdc++-v3-bootstrap
238
@if target-libstdc++-v3-bootstrap
239
# Override the above if we're bootstrapping C++.
239
# Override the above if we're bootstrapping C++.
240
POSTSTAGE1_CXX_EXPORT = \
240
POSTSTAGE1_CXX_EXPORT = \
241
	CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/g++$(exeext) \
241
	CXX="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xg++$(exeext) \
242
	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
242
	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \
243
	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
243
	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
244
	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
244
	  -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \

Return to bug 54279