From 20358adc34ae3d064e5057e5e6ad4e34de868eb4 Mon Sep 17 00:00:00 2001 From: Mikael Pettersson Date: Tue, 4 Nov 2008 03:16:07 +0100 Subject: [PATCH] re PR target/37989 (PR37528 fix broke --disable-shared on mingw32) 2008-11-03 Mikael Pettersson PR target/37989 * config/i386/mingw32.h (REAL_LIBGCC_SPEC): Only add libgcc_s.a or libgcc_eh.a to spec if ENABLE_SHARED_LIBGCC. From-SVN: r141575 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/mingw32.h | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ea8aed4..8b28c19 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-11-03 Mikael Pettersson + + PR target/37989 + * config/i386/mingw32.h (REAL_LIBGCC_SPEC): Only add libgcc_s.a + or libgcc_eh.a to spec if ENABLE_SHARED_LIBGCC. + 2008-11-03 Catherine Moore * config/mips.c (mips_conditional_register_usage): Handle the diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index 2526665..571277e 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -89,11 +89,15 @@ along with GCC; see the file COPYING3. If not see %(shared_libgcc_undefs)" /* Include in the mingw32 libraries with libgcc */ +#ifdef ENABLE_SHARED_LIBGCC +#define SHARED_LIBGCC_SPEC "%{shared-libgcc:-lgcc_s} %{!shared-libgcc:-lgcc_eh}" +#else +#define SHARED_LIBGCC_SPEC /*empty*/ +#endif #undef REAL_LIBGCC_SPEC #define REAL_LIBGCC_SPEC \ "%{mthreads:-lmingwthrd} -lmingw32 \ - %{shared-libgcc:-lgcc_s} \ - %{!shared-libgcc:-lgcc_eh} \ + "SHARED_LIBGCC_SPEC" \ -lgcc \ -lmoldname -lmingwex -lmsvcrt" -- 2.7.4