Makefile.in (CXX_FOR_TARGET): Use g++, not xgcc, to invoke the C++ compiler.

	* Makefile.in (CXX_FOR_TARGET): Use g++, not xgcc, to invoke
	the C++ compiler.

	* lib/g++.exp (g++init): Use g++, not xgcc, to invoke the C++
	compiler.
	(tool_option_proc): Fix typo.

From-SVN: r31593

diff --git a/ChangeLog b/ChangeLog
index e45c01b4b05c5fd3f41f3331f96f29018b44c890..eab5091e05b05c94f83f60d78f28b980b9e819d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-24  Mark Mitchell  <mark@codesourcery.com>
+
+       * Makefile.in (CXX_FOR_TARGET): Use g++, not xgcc, to invoke
+       the C++ compiler.
+
 Wed Jan 12 18:00:26 2000  Mark P. Mitchell  <mark@codesourcery.com>
 
        * configure.in: Fix typo in last change.

diff --git a/Makefile.in b/Makefile.in
index 369f1ff47be4eb412286532f9d83a3748e67310c..c6ea61f3481f717e30394788340eaf8130f7daf6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -247,15 +247,15 @@ CHILL_FOR_TARGET = ` \
   fi`
 
 CXX_FOR_TARGET = ` \
-  if [ -f $$r/gcc/xgcc ] ; then \
+  if [ -f $$r/gcc/g++ ] ; then \
     if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
       if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
-        echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+        echo $$r/gcc/g++ -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
       else \
-        echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
+        echo $$r/gcc/g++ -B$$r/gcc/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
       fi; \
     else \
-      echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/; \
+      echo $$r/gcc/g++ -B$$r/gcc/ -B$(build_tooldir)/bin/; \
     fi; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4d1c305fdb84a092b96f3a60bad9166c855858e3..1ec2bc12c08b8788a5d630320de1d90272ba2f79 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2000-01-24  Mark Mitchell  <mark@codesourcery.com>
+
+       * lib/g++.exp (g++init): Use g++, not xgcc, to invoke the C++
+       compiler.
+       (tool_option_proc): Fix typo.
+       
 2000-01-24  Geoff Keating  <geoffk@cygnus.com>
 
        * gcc.dg/special/ecos.exp (gcsec-1.c): Check the version

diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index 0cc681f32939356c4695ca56c47c310d17e1e5ae..720cd434f4c4dbbab97a3b1b81a3db89185a38d1 100644 (file)
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -85,7 +85,7 @@ proc g++_init { args } {
            if [is_remote host] {
                set GXX_UNDER_TEST [transform c++]
            } else {
-               set GXX_UNDER_TEST [findfile $base_dir/../xgcc "$base_dir/../xgcc -B$base_dir/../" [findfile $base_dir/xgcc "$base_dir/xgcc -B$base_dir/" [transform c++]]]
+               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++]]]
            }
        }
     }
@@ -97,7 +97,7 @@ proc g++_init { args } {
 
     if ![is_remote host] {
        if { [which $GXX_UNDER_TEST] == 0 } then {
-           perror "GXX_UNDER_TEST does not exist"
+           perror "GXX_UNDER_TEST ($GXX_UNDER_TEST) does not exist"
            exit 1
        }
     }
@@ -221,7 +221,7 @@ proc ${tool}_option_help { } {
 }
 
 proc ${tool}_option_proc { option } {
-    if[regexp "^--additional_options," $option] {
+    if [regexp "^--additional_options," $option] {
        global gpp_compile_options
        regsub "--additional_options," $option "" option
        foreach x [split $option ","] {