From 0f69ae5f31a77b06bb8d1fea1337c807c117e7fd Mon Sep 17 00:00:00 2001 From: ktietz Date: Fri, 30 Nov 2012 08:09:02 +0000 Subject: [PATCH] * config/i386/mingw32.h (SHARED_LIBGCC_SPEC): Synchronize with cygwin-host. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193986 138bc75d-0d04-0410-961f-82ee72b054a4 --- 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 903a77c..84bd55a 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 0e3751f..2e32e53 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.7.4