Makefile.in (GXX_ABI_FLAG): Don't define.

	* Makefile.in (GXX_ABI_FLAG): Don't define.
	* configure.in (--enable-new-gxx-abi): Remove option.
	* config.in: Regenerated.
	* configure: Likewise.

	* decl2.c (flag_vtable_thunks): Always set it to 1.
	(flag_new_abi): Likewise.
	* lang-specs.h: Remove conditional on ENABLE_NEW_GXX_ABI.

From-SVN: r39595

gcc/ChangeLog

+2001-02-11  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.in (GXX_ABI_FLAG): Don't define.
+	* configure.in (--enable-new-gxx-abi): Remove option.
+	* config.in: Regenerated.
+	* configure: Likewise.
+
 2001-02-12  Alexandre Oliva  <aoliva@redhat.com>
 
 	* lcm.c (compute_earliest): Let EXIT_BLOCK be handled as a regular

gcc/Makefile.in

@@ -193,9 +193,6 @@ GCC_FOR_TARGET = ./xgcc -B./ -B$(build_tooldir)/bin/ -isystem $(build_tooldir)/i
 # It also specifies -isystem ./include to find, e.g., stddef.h.
 GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(LOOSE_WARN) -isystem ./include $(TCFLAGS)
 
-# Specify the abi to use when building the c++ runtime
-GXX_ABI_FLAG=@GXX_ABI_FLAG@
-
 # Sed command to transform gcc to installed name.  Overwritten by configure.
 program_transform_name = @program_transform_name@
 program_transform_cross_name = s,^,$(target_alias)-,

gcc/config.in

@@ -446,9 +446,6 @@
 /* Define if your assembler supports dwarf2 .file/.loc directives. */
 #undef HAVE_AS_DWARF2_DEBUG_LINE
 
-/* Define if you want to always select the new-abi for g++. */
-#undef ENABLE_NEW_GXX_ABI
-
 /* Define to 1 if you want to enable namespaces (-fhonor-std) by default. */
 #undef ENABLE_STD_NAMESPACE
 

gcc/configure.in

@@ -1570,24 +1570,6 @@ zlibinc=
 AC_SUBST(zlibdir)
 AC_SUBST(zlibinc)
 
-# Build a new-abi (c++) system
-AC_ARG_ENABLE(new-gxx-abi,
-[  --enable-new-gxx-abi
-			  select the new abi for g++. You must select an ABI
-			  at configuration time, so that the correct runtime
-			  support is built. You cannot mix ABIs.],
-   ,
-  enable_new_gxx_abi=yes)
-
-if test x$enable_new_gxx_abi = xyes; then
-  AC_DEFINE(ENABLE_NEW_GXX_ABI, 1,
-	    [Define if you want to always select the new-abi for g++.])
-  GXX_ABI_FLAG='-fnew-abi'
-else
-  GXX_ABI_FLAG=
-fi
-AC_SUBST(GXX_ABI_FLAG)
-
 AC_DEFINE_UNQUOTED(ENABLE_STD_NAMESPACE, 1,
   [Define to 1 if you want to enable namespaces (-fhonor-std) by default.])
 

gcc/cp/ChangeLog

 2001-02-11  Mark Mitchell  <mark@codesourcery.com>
 
+	* decl2.c (flag_vtable_thunks): Always set it to 1.
+	(flag_new_abi): Likewise.
+	* lang-specs.h: Remove conditional on ENABLE_NEW_GXX_ABI.
+	
 	* Makefile.in (g++spec.o): Fix typo.
 
 2001-02-09  Jason Merrill  <jason@redhat.com>

gcc/cp/decl2.c

@@ -203,14 +203,7 @@ int warn_ctor_dtor_privacy = 1;
 /* True if we want to implement vtables using "thunks".
    The default is off.  */
 
-#if ENABLE_NEW_GXX_ABI
 int flag_vtable_thunks = 1;
-#else
-#ifndef DEFAULT_VTABLE_THUNKS
-#define DEFAULT_VTABLE_THUNKS 0
-#endif
-int flag_vtable_thunks = DEFAULT_VTABLE_THUNKS;
-#endif
 
 /* Nonzero means generate separate instantiation control files and juggle
    them at link time.  */
@@ -424,11 +417,7 @@ int flag_weak = 1;
 
 /* Nonzero to enable experimental ABI changes.  */
 
-#if ENABLE_NEW_GXX_ABI
 int flag_new_abi = 1;
-#else
-int flag_new_abi;
-#endif
 
 /* Nonzero to use __cxa_atexit, rather than atexit, to register
    destructors for local statics and global objects.  */

gcc/cp/lang-specs.h

@@ -31,7 +31,6 @@ Boston, MA 02111-1307, USA.  */
   {"@c++",
    /* cc1plus has an integrated ISO C preprocessor.  We should invoke
       the external preprocessor if -save-temps is given.  */
-#if ENABLE_NEW_GXX_ABI
     "%{E|M|MM:cpp0 -lang-c++ -D_GNU_SOURCE %{!no-gcc:-D__GNUG__=%v1}\
        %{!fno-exceptions:-D__EXCEPTIONS}\
        %{!fno-new-abi:-D__GXX_ABI_VERSION=100}\
@@ -50,26 +49,6 @@ Boston, MA 02111-1307, USA.  */
        %{ansi:-trigraphs -$}\
        %(cc1_options) %2 %{+e1*}\
        %{!fsyntax-only:%(invoke_as)}}}}"
-#else
-    "%{E|M|MM:cpp0 -lang-c++ %{!no-gcc:-D__GNUG__=%v1}\
-       %{!fno-exceptions:-D__EXCEPTIONS}\
-       %{fnew-abi:-D__GXX_ABI_VERSION=100}\
-       %{ansi:-D__STRICT_ANSI__ -trigraphs -$} %(cpp_options)}\
-     %{!E:%{!M:%{!MM:\
-       %{save-temps:cpp0 -lang-c++ \
-		    %{!no-gcc:-D__GNUG__=%v1}\
-		    %{fnew-abi:-D__GXX_ABI_VERSION=100}\
-		    %{ansi:-D__STRICT_ANSI__ -trigraphs -$}\
-		    %(cpp_options) %b.ii \n}\
-      cc1plus %{save-temps:-fpreprocessed %b.ii}\
-              %{!save-temps:%(cpp_options)\
-			    %{!no-gcc:-D__GNUG__=%v1}\
-			    %{fnew-abi:-D__GXX_ABI_VERSION=100}\
-			    %{ansi:-D__STRICT_ANSI__}}\
-       %{ansi:-trigraphs -$}\
-       %(cc1_options) %2 %{+e*}\
-       %{!fsyntax-only:%(invoke_as)}}}}"
-#endif
 #ifdef CPLUSPLUS_CPP_SPEC
      , CPLUSPLUS_CPP_SPEC
 #endif