merge from trunk

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/profile-stdlib@152425 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 69 insertions, 0 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b58bc9966bb..78aaa3e473a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,72 @@
+2009-09-30  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* configure.host (libgcj_sublib_ltflags): New variable.
+	* configure.ac (LIBGCJ_SUBLIB_LTFLAGS): AC_SUBST variable for
+	the above in makefiles.
+	* configure: Regenerate.
+
+	* Makefile.am (libgcj_la_LDFLAGS_NOUNDEF): Rename from this ...
+	(LIBJAVA_LDFLAGS_NOUNDEF): ... to this, initialise from
+	LIBGCJ_SUBLIB_LTFLAGS (only when building sublibs), and ...
+	(libgij_la_LDFLAGS, libgcj_tools_la_LDFLAGS, libjvm_la_LDFLAGS,
+	lib_gnu_awt_xlib_la_LDFLAGS, libgcj_bc_la_LDFLAGS): ... use it in
+	all these places to replace hard-coded -no-undefined and -bindir
+	flags, as well as ...
+	(libgcj_la_LDFLAGS): ... updating existing reference here.
+	* Makefile.in: Regenerate.
+	* include/Makefile.in: Likewise.
+	* testsuite/Makefile.in: Likewise.
+	* gcj/Makefile.in: Likewise.
+
+2009-09-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	PR libgcj/38298
+	* Makefile.am (libgcj_tools_la_LIBADD): Add '-lm'.
+	* Makefile.in: Regenerate.
+
+2009-09-22  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	* 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.
+
 2009-09-16  Jonathan Yong  <jon_y@users.sourceforge.net>
 
 	* gnu/java/security/jce/prng/natVMSecureRandomWin32.cc: Correct