aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--libtool.m49
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 42701f7..c7a2639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ PR libgcj/33085
+ * libtool.m4 (_LT_COMPILER_PIC) [ mingw, cygwin ] <GCJ>:
+ Do not use -DDLL_EXPORT. Backport from upstream.
+
2008-02-14 Nick Clifton <nickc@redhat.com>
Import this patch from gcc:
diff --git a/libtool.m4 b/libtool.m4
index ddc4b11..e86cd02 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*)