From 97d65e7b9de941c1f5862440bd59ca96d659251d Mon Sep 17 00:00:00 2001 From: Franz Sirl Date: Tue, 30 Jul 2002 20:42:14 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 4 ++++ gcc/cp/ChangeLog | 4 ++++ gcc/cp/lang-specs.h | 3 --- gcc/gcc.c | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 97bd68527f51..b1475497af88 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2002-07-30 Franz Sirl + + * gcc.c (cpp_unique_options): Define __GXX_ABI_VERSION, bump it to 101. + 2002-07-24 Frank van der Linden PR optimization/7291 diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a226d36d01fb..db6acdda578a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2002-07-30 Franz Sirl + + * lang-specs.h: Remove __GXX_ABI_VERSION, moved to gcc.c. + 2002-07-17 Scott Snyder PR c++/7320 diff --git a/gcc/cp/lang-specs.h b/gcc/cp/lang-specs.h index a8efd10e9285..a2bdf90d0a77 100644 --- 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 b594be680894..8941f4b43be2 100644 --- 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__}\ -- 2.47.2