gcc.c (cpp_unique_options): Define __GXX_ABI_VERSION, bump it to 101.

gcc/

	* gcc.c (cpp_unique_options): Define __GXX_ABI_VERSION, bump it to 101.

gcc/cp/

	* lang-specs.h: Remove __GXX_ABI_VERSION, moved to gcc.c.

From-SVN: r55880

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a7e5a6f3effa6476c6a698d5b7029d3e26904711..cb7797f522e1c16da71f5d876d504d190e425a76 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-30  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+       * gcc.c (cpp_unique_options): Define __GXX_ABI_VERSION, bump it to 101.
+
 2002-07-30  Richard Sandiford  <rsandifo@redhat.com>
 
        * config/mips/mips.h (SUBTARGET_ASM_DEBUGGING_SPEC): Fix typo.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ca6273157d3b8713e9c07fc4aa0a6fdd04fcec77..1b88fc583273f4b87223488357053b87d93d9fae 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-30  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+       * lang-specs.h: Remove __GXX_ABI_VERSION, moved to gcc.c.
+
 2002-07-30  Gabriel Dos Reis  <gdr@nerim.net>
 
        * cp-tree.h (VF_DERIVED_VALUE): Restore from previous deletion.

diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index 419fa92ff4d1199fc6889396e4a3a85602954ee3..f35ff716adfcec333b6c307708e1a74e461471e0 100644 (file)
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
@@ -38,7 +38,6 @@ Boston, MA 02111-1307, USA.  */
     "%{E|M|MM:cc1plus -E %{!no-gcc:-D__GNUG__=%v1}\
        %{!Wno-deprecated:-D__DEPRECATED}\
        %{!fno-exceptions:-D__EXCEPTIONS}\
-       -D__GXX_ABI_VERSION=100\
        %{ansi:-D__STRICT_ANSI__ -trigraphs -$} %(cpp_options) %2\
        %(cpp_debug_options)}\
      %{!E:%{!M:%{!MM:\
@@ -46,7 +45,6 @@ Boston, MA 02111-1307, USA.  */
                    %{!no-gcc:-D__GNUG__=%v1}\
                            %{!Wno-deprecated:-D__DEPRECATED}\
                    %{!fno-exceptions:-D__EXCEPTIONS}\
-                   -D__GXX_ABI_VERSION=100\
                    %{ansi:-D__STRICT_ANSI__ -trigraphs -$}\
                    %(cpp_options) %2 %b.ii \n}\
       cc1plus %{save-temps:-fpreprocessed %b.ii}\
@@ -54,7 +52,6 @@ Boston, MA 02111-1307, USA.  */
                            %{!no-gcc:-D__GNUG__=%v1} \
                                    %{!Wno-deprecated:-D__DEPRECATED}\
                            %{!fno-exceptions:-D__EXCEPTIONS}\
-                           -D__GXX_ABI_VERSION=100\
                            %{ansi:-D__STRICT_ANSI__}}\
        %{ansi:-trigraphs -$}\
        %(cc1_options) %2 %{+e1*}\

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 4e1ba5d6dce453b60adf0a308e1e501e24aba9a3..cd55240df720ea6cd64490b9b7d86f119c55239a 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -675,7 +675,7 @@ static const char *cpp_unique_options =
  %{MMD:-MMD %W{!o: %b.d}%W{o*:%.d%*}}\
  %{M} %{MM} %W{MF*} %{MG} %{MP} %{MQ*} %{MT*}\
  %{!E:%{!M:%{!MM:%{MD|MMD:%{o*:-MQ %*}}}}}\
- %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2 -D__GNUC_PATCHLEVEL__=%v3}\
+ %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2 -D__GNUC_PATCHLEVEL__=%v3 -D__GXX_ABI_VERSION=101}\
  %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\
  %{remap} %{g3:-dD} %{H} %C %{D*&U*&A*} %{i*} %Z %i\
  %{E|M|MM:%W{o*}}";