diff options
| author | Dave Korn <dave.korn.cygwin@gmail.com> | 2009-09-22 18:58:13 +0000 |
|---|---|---|
| committer | Dave Korn <davek@gcc.gnu.org> | 2009-09-22 18:58:13 +0000 |
| commit | 6a92b6c7aae7311777f8faafbc52a71104a78a68 (patch) | |
| tree | 89fb7aceeab12051629b5e047d3df2ddf3ab2894 /libjava/libltdl | |
| parent | 502a1e45907d04b3feeec2b3e5e5b80a10e9350f (diff) | |
| download | gcc-6a92b6c7aae7311777f8faafbc52a71104a78a68.zip gcc-6a92b6c7aae7311777f8faafbc52a71104a78a68.tar.gz gcc-6a92b6c7aae7311777f8faafbc52a71104a78a68.tar.bz2 | |
cygming.h (TARGET_USE_JCR_SECTION): Enable.
gcc/ChangeLog
* config/i386/cygming.h (TARGET_USE_JCR_SECTION): Enable.
* config/i386/cygwin.h (LIBGCJ_SONAME): Define.
* config/i386/mingw32.h (LIBGCJ_SONAME): Likewise.
libjava/ChangeLog
* configure.host (enable_libgcj_sublibs_default): New variable,
set for Cygwin and MinGW.
* configure.ac (--enable-libgcj-sublibs): New command-line switch.
(BUILD_SUBLIBS): New AM_CONDITIONAL relating to it.
(libgcj_spec_lgcj_override): New variable, define if building sublibs.
(libgcj_spec_lgcj_bc_override): Likewise for when USE_LIBGCJ_BC.
(LIBGCJ_SPEC_LGCJ): New variable to abstract "-lgcj" from specs.
(LIBGCJ_SPEC_LGCJ_BC): Likewise for when USE_LIBGCJ_BC.
(LIBGCJ_SPEC): Use them.
* configure: Regenerate.
* Makefile.am (LOWER_PACKAGE_FILES_LO): New variable.
(ALL_PACKAGE_SOURCE_FILES_LO): Likewise.
(NONCORE_PACKAGE_SOURCE_FILES_LO): Likewise.
(CORE_PACKAGE_SOURCE_FILES_LO): Likewise.
(toolexeclib_LTLIBRARIES): Add libgcj-noncore.la if building sublibs.
(libgcj_noncore_la_LIBADD_SUBOBJECTS): New variable.
(libgcj_la_LIBADD_SUBOBJECTS): Likewise.
(libgcj_la_LDFLAGS_NOUNDEF): Likewise.
(libgij_la_LDFLAGS): Add DLL-related options.
(libgcj_la_LDFLAGS): Use libgcj_la_LDFLAGS_NOUNDEF and
libgcj_la_LIBADD_SUBOBJECTS.
(libgcj_la_DEPENDENCIES): Adjust to match.
(libgcj_noncore_la_SOURCES, libgcj_noncore_la_LDFLAGS,
libgcj_noncore_la_LIBADD, libgcj_noncore_la_DEPENDENCIES,
libgcj_noncore_la_LINK): New automake variables for sublibrary.
(libgcj_tools_la_LDFLAGS): Add DLL-related flags.
(libgcj_tools_la_LIBADD): New variable.
(libjvm_la_LDFLAGS): Add DLL-related flags.
(lib_gnu_awt_xlib_la_LDFLAGS): Likewise.
(libgcj_bc_la_LDFLAGS): Likewise.
(libgij_la_DEPENDENCIES): Add dependency on libgcj-noncore.la when
building sublibs.
(libgcj_tools_la_DEPENDENCIES, libjvm_la_DEPENDENCIES,
lib_gnu_awt_xlib_la_DEPENDENCIES, jv_convert_DEPENDENCIES,
gcj_dbtool_DEPENDENCIES, gc_analyze_DEPENDENCIES, ecjx_DEPENDENCIES):
Likewise.
* Makefile.in: Regenerate.
* sysdep/i386/backtrace.h (MAIN_FUNC): New #define for main function,
set appropriately for Cygwin on that platform or to "main" elsewhere.
(fallback_backtrace): Use it to limit stack unwind.
libjava/libltdl/ChangeLog:
* ltdl.h (LT_SCOPE): Change conditional to avoid breaking
auto-export during libgcj DLL linking.
* Makefile.am (libltdl_la_LDFLAGS): Remove -bindir switch.
* Makefile.in: Regenerate.
From-SVN: r152041
Diffstat (limited to 'libjava/libltdl')
| -rw-r--r-- | libjava/libltdl/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/libltdl/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/libltdl/Makefile.in | 2 | ||||
| -rw-r--r-- | libjava/libltdl/ltdl.h | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog index d52d732..a2b5499 100644 --- a/libjava/libltdl/ChangeLog +++ b/libjava/libltdl/ChangeLog @@ -1,3 +1,10 @@ +2009-09-22 Dave Korn <dave.korn.cygwin@gmail.com> + + * ltdl.h (LT_SCOPE): Change conditional to avoid breaking + auto-export during libgcj DLL linking. + * Makefile.am (libltdl_la_LDFLAGS): Remove -bindir switch. + * Makefile.in: Regenerate. + 2009-08-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * configure.ac (AC_PREREQ): Bump to 2.64. Remove FIXME. diff --git a/libjava/libltdl/Makefile.am b/libjava/libltdl/Makefile.am index 8a2af10..737290e 100644 --- a/libjava/libltdl/Makefile.am +++ b/libjava/libltdl/Makefile.am @@ -22,7 +22,7 @@ endif CLEANFILES = libltdl.la libltdlc.la libltdl_la_SOURCES = ltdl.c -libltdl_la_LDFLAGS = -no-undefined -bindir "$(bindir)" -version-info 4:1:1 +libltdl_la_LDFLAGS = -no-undefined -version-info 4:1:1 libltdl_la_LIBADD = $(LIBADD_DL) libltdlc_la_SOURCES = ltdl.c diff --git a/libjava/libltdl/Makefile.in b/libjava/libltdl/Makefile.in index e321243..46e139e 100644 --- a/libjava/libltdl/Makefile.in +++ b/libjava/libltdl/Makefile.in @@ -249,7 +249,7 @@ INCLUDES = $(GCINCS) @CONVENIENCE_LTDL_TRUE@noinst_LTLIBRARIES = libltdlc.la CLEANFILES = libltdl.la libltdlc.la libltdl_la_SOURCES = ltdl.c -libltdl_la_LDFLAGS = -no-undefined -bindir "$(bindir)" -version-info 4:1:1 +libltdl_la_LDFLAGS = -no-undefined -version-info 4:1:1 libltdl_la_LIBADD = $(LIBADD_DL) libltdlc_la_SOURCES = ltdl.c libltdlc_la_LIBADD = $(LIBADD_DL) diff --git a/libjava/libltdl/ltdl.h b/libjava/libltdl/ltdl.h index 8aaf342..c31c579 100644 --- a/libjava/libltdl/ltdl.h +++ b/libjava/libltdl/ltdl.h @@ -128,7 +128,7 @@ LT_BEGIN_C_DECLS ridiculous implementation of data symbol exporting. */ #ifndef LT_SCOPE # ifdef __WINDOWS__ -# ifdef DLL_EXPORT /* defined by libtool (if required) */ +# ifdef LIBLTDL_DLL_EXPORT /* don't define or ld disables auto-export. */ # define LT_SCOPE __declspec(dllexport) # endif # ifdef LIBLTDL_DLL_IMPORT /* define if linking with this dll */ |