[Pkg-gnupg-commit] [libassuan] 427/437: w32: Use -static-libgcc to avoid linking to libgcc_s_sjlj-1.dll.

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit 5cdc9c457f4e549491fa3f0db75119abd078b070
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 30 17:06:28 2015 +0100

    w32: Use -static-libgcc to avoid linking to libgcc_s_sjlj-1.dll.
    
    * src/Makefile.am (extra_ltoptions): New.
    (libassuan_la_LDFLAGS): Use it.
    --
    
    Since gcc 4.8 there is a regression in that plain C programs may link
    to libgcc_s.a which has a dependency on libgcc_s_sjlj.dll.  This is
    for example triggered by using long long arithmetic on a 32 bit
    Windows (e.g symbol __udivdi3).
    
    This patch does not change anything right now but we add it anyway
    in case long long will ever be used.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 src/Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Makefile.am b/src/Makefile.am
index 435155e..8feef3a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -95,6 +95,7 @@ libassuan_res_ldflag = -Wl,.libs/versioninfo.o
 
 no_undefined = -no-undefined
 export_symbols = -export-symbols $(srcdir)/libassuan.def
+extra_ltoptions = -XCClinker -static-libgcc
 
 install-def-file:
 	$(INSTALL) $(srcdir)/libassuan.def $(DESTDIR)$(libdir)/libassuan.def
@@ -109,6 +110,8 @@ libassuan_res =
 libassuan_res_ldflag =
 no_undefined =
 export_symbols =
+extra_ltoptions =
+
 install-def-file:
 uninstall-def-file:
 
@@ -120,6 +123,7 @@ libassuan_la_SOURCES = $(common_sources) assuan-io.c
 nodist_libassuan_la_SOURCES = assuan.h
 libassuan_la_CPPFLAGS = $(AM_CPPFLAGS) @GPG_ERROR_CFLAGS@
 libassuan_la_LDFLAGS = $(libassuan_res_ldflag) $(no_undefined) \
+        $(extra_ltoptions) \
 	$(export_symbols) $(libassuan_version_script_cmd) -version-info \
 	@LIBASSUAN_LT_CURRENT@:@LIBASSUAN_LT_REVISION@:@LIBASSUAN_LT_AGE@
 libassuan_la_DEPENDENCIES = @LTLIBOBJS@ \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git