6a92b6c7aa
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
57 lines
1.6 KiB
Makefile
57 lines
1.6 KiB
Makefile
## Process this file with automake to produce Makefile.in
|
|
|
|
AUTOMAKE_OPTIONS = no-dependencies foreign
|
|
|
|
ACLOCAL_AMFLAGS = -I ../.. -I ../../config
|
|
|
|
INCLUDES = $(GCINCS)
|
|
|
|
if INSTALL_LTDL
|
|
include_HEADERS = ltdl.h
|
|
lib_LTLIBRARIES = libltdl.la
|
|
else
|
|
noinst_HEADERS = ltdl.h
|
|
endif
|
|
|
|
if CONVENIENCE_LTDL
|
|
noinst_LTLIBRARIES = libltdlc.la
|
|
endif
|
|
|
|
## Make sure these will be cleaned even when they're not built by
|
|
## default.
|
|
CLEANFILES = libltdl.la libltdlc.la
|
|
|
|
libltdl_la_SOURCES = ltdl.c
|
|
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)
|
|
|
|
## Because we do not have automatic dependency tracking:
|
|
ltdl.lo: ltdl.h config.h
|
|
|
|
$(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool
|
|
libtool: $(LIBTOOL_DEPS)
|
|
$(SHELL) ./config.status --recheck
|
|
|
|
## These are installed as a subdirectory of pkgdatadir so that
|
|
## libtoolize --ltdl can find them later:
|
|
ltdldatadir = $(datadir)/libtool/libltdl
|
|
ltdldatafiles = COPYING.LIB README acinclude.m4 aclocal.m4 \
|
|
Makefile.am Makefile.in configure.ac configure \
|
|
config-h.in config.guess config.sub \
|
|
install-sh missing ltmain.sh \
|
|
ltdl.c ltdl.h
|
|
|
|
## GCJ LOCAL: fix install buglet. See PR 27818
|
|
if INSTALL_LTDL
|
|
## To avoid spurious reconfiguration when the user installs these files
|
|
## with libtoolize, we have to preserve their timestamps carefully:
|
|
install-data-local:
|
|
-rm -rf $(DESTDIR)$(ltdldatadir)
|
|
$(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
|
|
( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
|
|
| ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
|
|
endif
|