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: r55881

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 97bd68527f51c26c92b9c897c27e7cc489e69c7a..b1475497af886323624e46cf2d26a1e839990a9b 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-24  Frank van der Linden  <fvdl@wasabisystems.com>
 
        PR optimization/7291

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a226d36d01fbd26447abd4246527ab974563cfc2..db6acdda578ad19c368c288aa5cf695b024b472b 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-17  Scott Snyder <snyder@fnal.gov>
 
        PR c++/7320

diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h
index a8efd10e92859027cd4c2b406d3e2d5b458042cc..a2bdf90d0a7732b414478d9d11e9f622b47b6b73 100644 (file)
--- a/gcc/cp/lang-specs.h
+++ b/gcc/cp/lang-specs.h
@@ -38,14 +38,12 @@ Boston, MA 02111-1307, USA.  */
     "%{E|M|MM:cpp0 -lang-c++ %{!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)}\
      %{!E:%{!M:%{!MM:\
        %{save-temps|no-integrated-cpp:cpp0 -lang-c++ \
                    %{!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) %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
       cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
@@ -53,7 +51,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 b594be680894e26a4e1078e4740f507b32bbd912..8941f4b43be240c68e3980c5c82c99cf91f42977 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}\
  %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
  %{fno-inline|O0|!O*:-D__NO_INLINE__} %{ffast-math:-D__FAST_MATH__}\