This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

PATCH: Always turn on the new ABI



This patch removes the --enable-new-gxx-abi flag; the new ABI is
always on now.

Tested on i686-pc-linux-gnu.

--
Mark Mitchell                   mark@codesourcery.com
CodeSourcery, LLC               http://www.codesourcery.com

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-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.

Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.600
diff -c -p -r1.600 Makefile.in
*** Makefile.in	2001/02/11 21:23:37	1.600
--- Makefile.in	2001/02/12 07:16:59
*************** GCC_FOR_TARGET = ./xgcc -B./ -B$(build_t
*** 193,201 ****
  # 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)-,
--- 193,198 ----
Index: gcc/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.in,v
retrieving revision 1.482
diff -c -p -r1.482 configure.in
*** configure.in	2001/02/05 09:47:58	1.482
--- configure.in	2001/02/12 07:17:04
*************** zlibinc=
*** 1570,1593 ****
  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.])
  
--- 1570,1575 ----
Index: gcc/cp/decl2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/decl2.c,v
retrieving revision 1.435
diff -c -p -r1.435 decl2.c
*** decl2.c	2001/02/05 11:45:15	1.435
--- decl2.c	2001/02/12 07:17:16
*************** int warn_ctor_dtor_privacy = 1;
*** 203,216 ****
  /* 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.  */
--- 203,209 ----
*************** int flag_weak = 1;
*** 424,434 ****
  
  /* 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.  */
--- 417,423 ----
Index: gcc/cp/lang-specs.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/lang-specs.h,v
retrieving revision 1.38
diff -c -p -r1.38 lang-specs.h
*** lang-specs.h	2001/02/09 12:07:07	1.38
--- lang-specs.h	2001/02/12 07:17:16
*************** Boston, MA 02111-1307, USA.  */
*** 31,37 ****
    {"@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}\
--- 31,36 ----
*************** Boston, MA 02111-1307, USA.  */
*** 50,75 ****
         %{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
--- 49,54 ----


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]