From bb44c9d2df304872a0d6085a452883eefd2492af Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 16 Feb 2008 03:57:53 +0000 Subject: [PATCH] re PR libgcj/33085 (liblt_prog_compiler_pic_GCJ='-DDLL_EXPORT' is wrong) PR libgcj/33085 * libtool.m4 (_LT_COMPILER_PIC) [ mingw, cygwin ] : Do not use -DDLL_EXPORT. Backport from upstream. libjava/ PR libgcj/33085 * configure: Regenerate. From-SVN: r132362 --- ChangeLog | 6 ++++++ libjava/ChangeLog | 5 +++++ libjava/configure | 4 ++-- libtool.m4 | 9 ++++++--- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01221a4..0628614 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-13 Ralf Wildenhues * MAINTAINERS (Write After Approval): Add myself. diff --git a/libjava/ChangeLog b/libjava/ChangeLog index bdbe25b..3381312 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2008-02-16 Ralf Wildenhues + + PR libgcj/33085 + * configure: Regenerate. + 2008-02-15 Andreas Tobler PR testsuite/35208 diff --git a/libjava/configure b/libjava/configure index 2d019a6..69dec24 100755 --- a/libjava/configure +++ b/libjava/configure @@ -15777,7 +15777,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 # 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_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; darwin* | rhapsody*) @@ -15853,7 +15853,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 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_prog_compiler_pic_GCJ='-DDLL_EXPORT' + ;; hpux9* | hpux10* | hpux11*) 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*) -- 2.7.4