From 49fdf406ac9eb9f7a58de34ee5e7ed9b1552448d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 16 Feb 2008 15:26:46 +0000 Subject: [PATCH] 2008-02-16 Ralf Wildenhues PR libgcj/33085 * libtool.m4 (_LT_COMPILER_PIC) [ mingw, cygwin ] : Do not use -DDLL_EXPORT. Backport from upstream. --- ChangeLog | 6 ++++++ libtool.m4 | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42701f7a3..c7a263983 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-16 Ralf Wildenhues + + PR libgcj/33085 + * libtool.m4 (_LT_COMPILER_PIC) [ mingw, cygwin ] : + Do not use -DDLL_EXPORT. Backport from upstream. + 2008-02-14 Nick Clifton Import this patch from gcc: diff --git a/libtool.m4 b/libtool.m4 index ddc4b1189..e86cd0249 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -3419,7 +3419,8 @@ m4_if([$1], [CXX], [ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3715,7 +3716,8 @@ m4_if([$1], [CXX], [ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -3791,7 +3793,8 @@ m4_if([$1], [CXX], [ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; hpux9* | hpux10* | hpux11*)