From d71576d634a27eed6e34aee7abfd1b89d32d8949 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 30 Nov 2012 09:09:02 +0100 Subject: [PATCH] mingw32.h (SHARED_LIBGCC_SPEC): Synchronize with cygwin-host. * config/i386/mingw32.h (SHARED_LIBGCC_SPEC): Synchronize with cygwin-host. From-SVN: r193986 --- gcc/ChangeLog | 5 +++++ gcc/config/i386/mingw32.h | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 903a77cf4af1..84bd55ac06e6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-11-30 Kai Tietz + + * config/i386/mingw32.h (SHARED_LIBGCC_SPEC): Synchronize with + cygwin-host. + 2012-11-29 Eric Botcazou PR middle-end/55321 diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index 0e3751f4e19e..2e32e5331df6 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -121,15 +121,24 @@ along with GCC; see the file COPYING3. If not see /* Include in the mingw32 libraries with libgcc */ #ifdef ENABLE_SHARED_LIBGCC -#define SHARED_LIBGCC_SPEC "%{shared-libgcc:-lgcc_s} %{!shared-libgcc:-lgcc_eh}" +#define SHARED_LIBGCC_SPEC " \ + %{static|static-libgcc:-lgcc -lgcc_eh} \ + %{!static: \ + %{!static-libgcc: \ + %{!shared: \ + %{!shared-libgcc:-lgcc -lgcc_eh} \ + %{shared-libgcc:-lgcc_s -lgcc} \ + } \ + %{shared:-lgcc_s -lgcc} \ + } \ + } " #else -#define SHARED_LIBGCC_SPEC /*empty*/ +#define SHARED_LIBGCC_SPEC " -lgcc " #endif #undef REAL_LIBGCC_SPEC #define REAL_LIBGCC_SPEC \ "%{mthreads:-lmingwthrd} -lmingw32 \ "SHARED_LIBGCC_SPEC" \ - -lgcc \ -lmoldname -lmingwex -lmsvcrt" #undef STARTFILE_SPEC -- 2.47.3