diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-19 18:19:39 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-19 18:19:39 +0000 |
| commit | e56043cd2c207982e812ce6fcecb7353dea58363 (patch) | |
| tree | 01a6f37ad5a9ae6b18bdc20f052b04e19b4255c0 /libjava | |
| parent | 2e02a1a4548f2ee1ea519c88e68b20621ad16fcc (diff) | |
| download | gcc-e56043cd2c207982e812ce6fcecb7353dea58363.tar.gz | |
2010-09-19 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 164348, with some improvements
in gcc/melt-runtime.[ch]
2010-09-19 Basile Starynkevitch <basile@starynkevitch.net>
[[merged with trunk rev.164348, so improved MELT runtime!]]
* gcc/melt-runtime.h: improved comments.
(melt_debug_garbcoll, melt_debuggc_eprintf): Moved from melt-runtime.c.
(melt_obmag_string): New declaration.
(struct meltobject_st, struct meltclosure_st, struct
meltroutine_st, struct meltmixbigint_st, struct meltstring_st):
using GTY variable_size and @@MELTGTY@@ comment.
(melt_mark_special): added debug print.
* gcc/melt-runtime.c: Improved comments.
Include bversion.h, realmpfr.h, gimple-pretty-print.h.
(ggc_force_collect) Declared external.
(melt_forward_counter): Added.
(melt_obmag_string): New function.
(melt_alptr_1, melt_alptr_2, melt_break_alptr_1_at)
(melt_break_alptr_2_at, melt_break_alptr_1,melt_break_alptr_1)
(melt_allocate_young_gc_zone, melt_free_young_gc_zone): New.
(delete_special, meltgc_make_special): Improved debug printf and
use melt_break_alptr_1...
(ggc_alloc_*) macros defined for backport to GCC 4.5
(melt_forwarded_copy): Don't clear the new destination zone in old
GGC heap.
(meltgc_add_out_raw_len): Use ggc_alloc_atomic.
(meltgc_raw_new_mappointers, meltgc_raw_put_mappointers)
(meltgc_raw_remove_mappointers): Corrected length argument to
ggc_alloc_cleared_vec_entrypointermelt_st.
(melt_really_initialize): Call melt_allocate_young_gc_zone.
(melt_initialize): Set flag_plugin_added.
(melt_val2passflag): TODO_verify_loops only in GCC 4.5
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@164424 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
49 files changed, 982 insertions, 802 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8bc03cc54ad..7094149fb2c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,163 @@ +2010-08-27 Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> + Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR libgcj/40868 + * configure.ac: Add GCC_FOR_ECJX variable. Ensure + GCJ_FOR_ECJX is always set. + * Makefile.am [!NATIVE] (ecjx.$(OBJEXT)): New rule. + * Makefile.in: Regenerate. + * configure: Regenerate. + * gcj/Makefile.in: Regenerate. + * include/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. + +2010-08-18 Jack Howarth <howarth@bromo.med.uc.edu> + + * libjava/configure.ac (THREADLIBS): Don't set on Darwin. + (THREADSPEC): Likwise. + * libjava/configure: Regenerate. + * libjava/Makefile.am: Define LIBJAVA_LDFLAGS_LIBMATH as + -lm only if USING_DARWIN_CRT undefined. + (libgcj_tools_la_LIBADD): Replace '-lm' with $(LIBJAVA_LDFLAGS_LIBMATH). + * libjava/Makefile.in: Regenerate. + +2010-08-17 Iain Sandoe <iains@gcc.gnu.org> + + * include/posix.h: Make substitution of + _darwin10_Unwind_FindEnclosingFunction conditional on + OSX >= 10.6 (Darwin10). + +2010-08-12 Tom Tromey <tromey@redhat.com> + + * gnu/java/security/jce/prng/natVMSecureRandomWin32.cc + (natGenerateSeed): Add missing "::". + +2010-07-23 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * configure.ac (*-*-solaris2.8): Use alternate thread library. + Add libthread. + (*-*-solaris2.9): Use libthread. + * configure: Regenerate. + +2010-07-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * include/sparc-signal.h: Renamed to ... + * include/solaris-signal.h: ... this. + * configure.ac: Use it on any *-*-solaris2* target. + * configure: Regenerate. + * configure.host (i?86-*-solaris2*): Set can_unwind_signal=yes. + * Makefile.am (prims.lo): Add -fno-omit-frame-pointer to AM_CXXFLAGS. + * Makefile.in: Regenerate. + +2010-07-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * configure.ac (ANONVERSCRIPT): Handle sun style. + Define ANONVERSCRIPT_GNU, ANONVERSCRIPT_SUN automake conditionals. + * configure: Regenerate. + + * Makefile.am [ANONVERSCRIPT]: Protect GNU section with + ANONVERSCRIPT_GNU. + Introduce per-library $(lib)_la_version_arg, $(lib)_la_version_dep + variables. + [ANONVERSCRIPT_GNU] (version_arg): Default ld arg for version map. + (version_dep): Likewise for dependency. + Use them to set the per-library variables. + [!ANONVERSCRIPT]: Provide them vor the unversioned case. + [ANONVERSCRIPT_SUN]: Handle Sun symbol versioning. + (libgcj_la_DEPENDENCIES): Unconditionally use + $(libgcj_la_version_dep). + (libgcj_la_LINK): Add $(libgcj_la_version_arg). + (libgcj_noncore_la_DEPENDENCIES): Unconditionally use + $(libgcj_la_version_dep). + (libgcj_tools_la_LIBADD): Move -lm ... + (libgcj_tools_la_LDFLAGS): ... here. + (libgcj_tools_la_DEPENDENCIES): Add + $(libgcj_tools_la_version_dep). + (libgcj_tools_la_LINK): Add $(libgcj_tools_la_version_arg). + (lib_gnu_awt_xlib_la_DEPENDENCIES): Add + $(lib_gnu_awt_xlib_la_version_dep). + (lib_gnu_awt_xlib_la_LINK): Add + $(lib_gnu_awt_xlib_la_version_arg). + (libgcj_bc_la_DEPENDENCIES): Add $(libgcj_bc_la_version_dep). + (libgcj_bc_la_LINK): $(libgcj_bc_la_version_arg). + [ANONVERSCRIPT && ANONVERSCRIPT_SUN] (%.ver-sun): New pattern rule. + * Makefile.in: Regenerate. + + * libgcj.ver: Reformat. + +2010-06-10 Peter O'Gorman <peter@pogma.com> + + * configure.ac: Set SYSTEMSPEC so that -allow_stack_execute is not + passed to the linker for -dynamiclib or -bundle on darwin. + * configure: Regenerate. + +2010-06-09 Iain Sandoe <iains@gcc.gnu.org> + + PR bootstrap/43170 + * configure: Regenerate. + +2010-06-03 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * configure: Regenerate. + +2010-06-03 Matthias Klose <doko@ubuntu.com> + + * libtool-version: Bump soversion. + +2010-05-29 Mike Stump <mikestump@comcast.net> + + * configure.ac: Add multilib support for gmp. Proper -I and -L + flags for gmp are added. + +2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * configure.ac: Redirect grep stdout, stderr to /dev/null instead + of grep -q. + Use -- instead of grep -e. + * configure: Regenerate. + +2010-05-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR libgcj/44216 + * configure.ac (libgcj_cv_exidx): Enable AC_LANG_WERROR. + Save and restore werror flag. + * configure: Regenerate. + +2010-05-04 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR other/43620 + * configure.ac (AM_INIT_AUTOMAKE): Add no-dist. + * Makefile.in: Regenerate. + * gcj/Makefile.in: Regenerate. + * include/Makefile.in: Regenerate. + * testsuite/Makefile.in: Regenerate. + +2010-05-03 Jack Howarth <howarth@bromo.med.uc.edu> + + PR 43839 + * testsuite/Makefile.am: Override automake for site.exp creation + and add entry to set libiconv. + * testsuite/Makefile.in: Regenerate. + * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): + Add new global variable libiconv to handle alternative libiconv + locations. + +2010-04-19 Andrew Haley <aph@redhat.com> + + PR libgcj/40860 + * configure.ac: Handle --no-merge-exidx-entries. + +2010-04-07 Jakub Jelinek <jakub@redhat.com> + + * exception.cc (_Jv_Throw): Avoid set but not used warning. + * include/java-assert.h (JvAssertMessage, JvAssert): Use argument in + sizeof to avoid set but not used warnings. + +2010-04-07 Jason Merrill <jason@redhat.com> + + * gnu/gcj/runtime/natSharedLibLoader.cc (findCore): Move + declaration of _Jv_create_core out of the function. + 2010-04-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in: Regenerate. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 190c686e65e..52d09955609 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -291,7 +291,45 @@ extra_ldflags_libjava = @extra_ldflags_libjava@ extra_ldflags = @extra_ldflags@ if ANONVERSCRIPT -extra_ldflags_libjava += -Wl,--version-script=$(srcdir)/libgcj.ver +if ANONVERSCRIPT_GNU +version_arg = -Wl,--version-script=$(srcdir)/libgcj.ver +libgcj_la_version_arg = $(version_arg) +libgcj_tools_la_version_arg = $(version_arg) +lib_gnu_awt_xlib_la_version_arg = $(version_arg) +libgcj_bc_la_version_arg = $(version_arg) + +version_dep = $(srcdir)/libgcj.ver +libgcj_la_version_dep = $(version_dep) +libgcj_tools_la_version_dep = $(version_dep) +lib_gnu_awt_xlib_la_version_dep = $(version_dep) +libgcj_bc_la_version_dep = $(version_dep) +endif +if ANONVERSCRIPT_SUN +libgcj_la_version_arg = -Wl,-M,libgcj.ver-sun +libgcj_tools_la_version_arg = -Wl,-M,libgcj_tools.ver-sun +lib_gnu_awt_xlib_la_version_arg = -Wl,-M,lib_gnu_awt_xlib.ver-sun +libgcj_bc_la_version_arg = -Wl,-M,libgcj_bc.ver-sun + +libgcj_la_version_dep = libgcj.ver-sun +libgcj_tools_la_version_dep = libgcj_tools.ver-sun +lib_gnu_awt_xlib_la_version_dep = lib_gnu_awt_xlib.ver-sun +libgcj_bc_la_version_dep = libgcj_bc.ver-sun + +# The pattern rule necessary to build the *.ver-sun mapfiles is at the end +# of the file, see below. +endif +else +version_arg = +libgcj_la_version_arg = $(version_arg) +libgcj_tools_la_version_arg = $(version_arg) +lib_gnu_awt_xlib_la_version_arg = $(version_arg) +libgcj_bc_la_version_arg = $(version_arg) + +version_dep = +libgcj_la_version_dep = $(version_dep) +libgcj_tools_la_version_dep = $(version_dep) +lib_gnu_awt_xlib_la_version_dep = $(version_dep) +libgcj_bc_la_version_dep = $(version_dep) endif LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) @@ -406,6 +444,8 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc \ ## We need to compile at least the interpreter this way. interpret.lo: AM_CXXFLAGS += -fwrapv +## Necessary so EH works on 64-bit Solaris 2. +prims.lo: AM_CXXFLAGS += -fno-omit-frame-pointer if USING_BOEHMGC libgcj_la_SOURCES += boehm.cc @@ -425,6 +465,9 @@ endif if USING_DARWIN_CRT libgcj_la_SOURCES += darwin.cc +LIBJAVA_LDFLAGS_LIBMATH = +else +LIBJAVA_LDFLAGS_LIBMATH = -lm endif if USING_POSIX_THREADS @@ -463,11 +506,9 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ java/process-$(PLATFORM).lo \ $(ALL_PACKAGE_SOURCE_FILES_LO) \ $(LIBLTDL) $(libgcj_la_LIBADD) \ - $(LIBJAVA_CORE_EXTRA) -if ANONVERSCRIPT -libgcj_la_DEPENDENCIES += $(srcdir)/libgcj.ver -endif -libgcj_la_LINK = $(LIBLINK) $(libgcj_la_LDFLAGS) + $(LIBJAVA_CORE_EXTRA) \ + $(libgcj_la_version_dep) +libgcj_la_LINK = $(LIBLINK) $(libgcj_la_LDFLAGS) $(libgcj_la_version_arg) ## A hack to make sure the various gcj-related macros, like ## LTGCJCOMPILE, are defined by automake. This is never actually @@ -490,10 +531,7 @@ libgcj_noncore_la_SOURCES = libgcj_noncore_la_LDFLAGS = $(libgcj_la_LDFLAGS) libgcj_noncore_la_LIBADD = $(libgcj_noncore_la_LIBADD_SUBOBJECTS) libgcj.la libgcj_noncore_la_DEPENDENCIES = libgcj-$(gcc_version).jar $(LIBLTDL) \ - $(libgcj_noncore_la_LIBADD) libgcj.la -if ANONVERSCRIPT -libgcj_noncore_la_DEPENDENCIES += $(srcdir)/libgcj.ver -endif + $(libgcj_noncore_la_LIBADD) libgcj.la $(libgcj_la_version_dep) libgcj_noncore_la_LINK = $(libgcj_la_LINK) endif # BUILD_SUBLIBS @@ -509,13 +547,17 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \ -fsource-filename=$(here)/classpath/tools/all-classes.lst libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ - $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) -libgcj_tools_la_LIBADD = libgcj.la -lm -libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec + $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) \ + $(LIBJAVA_LDFLAGS_LIBMATH) + +libgcj_tools_la_LIBADD = libgcj.la +libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec \ + $(libgcj_tools_la_version_dep) if BUILD_SUBLIBS libgcj_tools_la_DEPENDENCIES += libgcj-noncore.la endif -libgcj_tools_la_LINK = $(LIBLINK) $(libgcj_tools_la_LDFLAGS) +libgcj_tools_la_LINK = $(LIBLINK) $(libgcj_tools_la_LDFLAGS) \ + $(libgcj_tools_la_version_arg) ## libjvm.so libjvm_la_SOURCES = jni-libjvm.cc @@ -543,6 +585,7 @@ lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files) lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ libgcj.la libgcj.spec \ + $(lib_gnu_awt_xlib_la_version_dep) \ $(lib_gnu_awt_xlib_la_LIBADD) if BUILD_SUBLIBS lib_gnu_awt_xlib_la_DEPENDENCIES += libgcj-noncore.la @@ -558,7 +601,8 @@ lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \ @X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \ -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) -lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS) +lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS) \ + $(lib_gnu_awt_xlib_la_version_arg) ## Support for libgcj_bc: dummy shared library. ## @@ -567,8 +611,9 @@ lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS) libgcj_bc_la_SOURCES = libgcj_bc.c libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0 \ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) -libgcj_bc_la_DEPENDENCIES = libgcj.la -libgcj_bc_la_LINK = $(LIBLINK) $(libgcj_bc_la_LDFLAGS) +libgcj_bc_la_DEPENDENCIES = libgcj.la $(libgcj_bc_la_version_dep) +libgcj_bc_la_LINK = $(LIBLINK) $(libgcj_bc_la_LDFLAGS) \ + $(libgcj_bc_la_version_arg) ## This is specific to Linux/{Free,Net,Open}BSD/Hurd and perhaps few others. ## USE_LIBGCJ_BC shouldn't be set on other targets. libgcj_bc_dummy_LINK = $(CC) -L$(here)/.libs $(CFLAGS) $(LDFLAGS) -shared \ @@ -1125,6 +1170,8 @@ ecjx_LINK = $(GCJ_FOR_ECJX_LINK) $(ecjx_LDFLAGS) ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) ecjx_LDADD = ecjx_DEPENDENCIES = +ecjx.$(OBJEXT): ecjx.cc + $(GCC_FOR_ECJX) -c $< endif !NATIVE @@ -1574,3 +1621,22 @@ distclean-multi: $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean maintainer-clean-multi: $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean + +if ANONVERSCRIPT +if ANONVERSCRIPT_SUN +# This must be at the end of the Makefile, otherwise .SECONDEXPANSION +# causes expansion of filenames with $ in their names, which breaks the build. +# .SECONDEXPANSION is necessary to allow the use of automatic variables ($@ +# in this case) in the requisites of pattern rules. +.SECONDEXPANSION: + +%.ver-sun : $(srcdir)/libgcj.ver \ + $(top_srcdir)/../contrib/make_sunver.pl \ + $$($$(basename $$@)_la_OBJECTS) $$($$(basename $$@)_la_LIBADD) + perl $(top_srcdir)/../contrib/make_sunver.pl \ + $(srcdir)/libgcj.ver \ + `echo $($(basename $@)_la_OBJECTS) $($(basename $@)_la_LIBADD) | \ + sed 's,\([^/ ]*\)\.l\([ao]\),.libs/\1.\2,g'` \ + > $@ || (rm -f $@ ; exit 1) +endif +endif diff --git a/libjava/Makefile.in b/libjava/Makefile.in index ed3b23b0386..c29d5cd1c31 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -49,47 +49,42 @@ target_triplet = @target@ @INSTALL_BINARIES_FALSE@@NATIVE_TRUE@am__append_7 = $(bin_programs) @INSTALL_AOT_RPM_TRUE@am__append_8 = contrib/aot-compile-rpm @BUILD_ECJ1_TRUE@libexecsub_PROGRAMS = ecjx$(EXEEXT) -@ANONVERSCRIPT_TRUE@am__append_9 = -Wl,--version-script=$(srcdir)/libgcj.ver -@USING_GCC_TRUE@am__append_10 = $(WARNINGS) -@BUILD_SUBLIBS_TRUE@am__append_11 = libgcj-noncore.la -@USING_BOEHMGC_TRUE@am__append_12 = boehm.cc -@USING_NOGC_TRUE@am__append_13 = nogc.cc -@USING_POSIX_PLATFORM_TRUE@am__append_14 = posix.cc -@USING_WIN32_PLATFORM_TRUE@am__append_15 = win32.cc -@USING_DARWIN_CRT_TRUE@am__append_16 = darwin.cc -@USING_POSIX_THREADS_TRUE@am__append_17 = posix-threads.cc -@USING_WIN32_THREADS_TRUE@am__append_18 = win32-threads.cc -@USING_NO_THREADS_TRUE@am__append_19 = no-threads.cc -@ANONVERSCRIPT_TRUE@am__append_20 = $(srcdir)/libgcj.ver -@ANONVERSCRIPT_TRUE@@BUILD_SUBLIBS_TRUE@am__append_21 = $(srcdir)/libgcj.ver -@BUILD_SUBLIBS_TRUE@am__append_22 = libgcj-noncore.la -@BUILD_SUBLIBS_TRUE@am__append_23 = libgcj-noncore.la -@BUILD_SUBLIBS_TRUE@am__append_24 = libgcj-noncore.la -DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ - $(srcdir)/../config.guess $(srcdir)/../config.sub \ - $(srcdir)/../depcomp $(srcdir)/../install-sh \ - $(srcdir)/../ltmain.sh $(srcdir)/../missing \ - $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/libgcj-test.spec.in \ - $(srcdir)/libgcj.pc.in $(srcdir)/libgcj.spec.in \ - $(srcdir)/sources.am $(top_srcdir)/configure \ - $(top_srcdir)/contrib/aot-compile-rpm.in \ - $(top_srcdir)/contrib/aot-compile.in \ +@USING_GCC_TRUE@am__append_9 = $(WARNINGS) +@BUILD_SUBLIBS_TRUE@am__append_10 = libgcj-noncore.la +@USING_BOEHMGC_TRUE@am__append_11 = boehm.cc +@USING_NOGC_TRUE@am__append_12 = nogc.cc +@USING_POSIX_PLATFORM_TRUE@am__append_13 = posix.cc +@USING_WIN32_PLATFORM_TRUE@am__append_14 = win32.cc +@USING_DARWIN_CRT_TRUE@am__append_15 = darwin.cc +@USING_POSIX_THREADS_TRUE@am__append_16 = posix-threads.cc +@USING_WIN32_THREADS_TRUE@am__append_17 = win32-threads.cc +@USING_NO_THREADS_TRUE@am__append_18 = no-threads.cc +@BUILD_SUBLIBS_TRUE@am__append_19 = libgcj-noncore.la +@BUILD_SUBLIBS_TRUE@am__append_20 = libgcj-noncore.la +@BUILD_SUBLIBS_TRUE@am__append_21 = libgcj-noncore.la +DIST_COMMON = $(srcdir)/sources.am NEWS README ChangeLog THANKS \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/../mkinstalldirs $(srcdir)/libgcj.pc.in \ + $(srcdir)/libgcj.spec.in $(srcdir)/libgcj-test.spec.in \ $(top_srcdir)/contrib/aotcompile.py.in \ + $(top_srcdir)/contrib/aot-compile.in \ + $(top_srcdir)/contrib/aot-compile-rpm.in \ $(top_srcdir)/contrib/generate-cacerts.pl.in \ $(top_srcdir)/contrib/rebuild-gcj-db.in \ + $(top_srcdir)/scripts/jar.in \ + $(top_srcdir)/java/lang/nat${PLATFORM}Process.cc \ $(top_srcdir)/gnu/java/nio/natVMPipe${PLATFORM}.cc \ $(top_srcdir)/gnu/java/nio/natVMSelector${PLATFORM}.cc \ - $(top_srcdir)/java/lang/nat${PLATFORM}Process.cc \ - $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS -@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__append_25 = gen-from-JIS -@BUILD_SUBLIBS_TRUE@am__append_26 = libgcj-noncore.la -@BUILD_SUBLIBS_TRUE@am__append_27 = libgcj-noncore.la -@BUILD_SUBLIBS_TRUE@am__append_28 = libgcj-noncore.la -@BUILD_SUBLIBS_TRUE@@NATIVE_TRUE@am__append_29 = libgcj-noncore.la -@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_30 = libgcj_bc.la -@NATIVE_TRUE@@USE_LIBGCJ_BC_FALSE@am__append_31 = libgcj.la -@XLIB_AWT_TRUE@am__append_32 = $(xlib_nat_headers) + $(srcdir)/../depcomp +@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__append_22 = gen-from-JIS +@BUILD_SUBLIBS_TRUE@am__append_23 = libgcj-noncore.la +@BUILD_SUBLIBS_TRUE@am__append_24 = libgcj-noncore.la +@BUILD_SUBLIBS_TRUE@am__append_25 = libgcj-noncore.la +@BUILD_SUBLIBS_TRUE@@NATIVE_TRUE@am__append_26 = libgcj-noncore.la +@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_27 = libgcj_bc.la +@NATIVE_TRUE@@USE_LIBGCJ_BC_FALSE@am__append_28 = libgcj.la +@XLIB_AWT_TRUE@am__append_29 = $(xlib_nat_headers) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \ @@ -323,72 +318,6 @@ am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(propertyo_files) \ @BUILD_SUBLIBS_TRUE@am__DEPENDENCIES_4 = \ @BUILD_SUBLIBS_TRUE@ $(CORE_PACKAGE_SOURCE_FILES_LO) am__DEPENDENCIES_5 = -am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \ - stacktrace.cc link.cc defineclass.cc verify.cc jvmti.cc \ - interpret.cc gnu/classpath/jdwp/natVMFrame.cc \ - gnu/classpath/jdwp/natVMMethod.cc \ - gnu/classpath/jdwp/natVMVirtualMachine.cc \ - gnu/classpath/natConfiguration.cc \ - gnu/classpath/natSystemProperties.cc \ - gnu/classpath/natVMStackWalker.cc gnu/gcj/natCore.cc \ - gnu/gcj/convert/JIS0208_to_Unicode.cc \ - gnu/gcj/convert/JIS0212_to_Unicode.cc \ - gnu/gcj/convert/Unicode_to_JIS.cc gnu/gcj/convert/natIconv.cc \ - gnu/gcj/convert/natInput_EUCJIS.cc \ - gnu/gcj/convert/natInput_SJIS.cc \ - gnu/gcj/convert/natOutput_EUCJIS.cc \ - gnu/gcj/convert/natOutput_SJIS.cc \ - gnu/gcj/io/natSimpleSHSStream.cc gnu/gcj/io/shs.cc \ - gnu/gcj/jvmti/natBreakpoint.cc \ - gnu/gcj/jvmti/natNormalBreakpoint.cc \ - gnu/gcj/runtime/natFinalizerThread.cc \ - gnu/gcj/runtime/natSharedLibLoader.cc \ - gnu/gcj/runtime/natSystemClassLoader.cc \ - gnu/gcj/runtime/natStringBuffer.cc gnu/gcj/util/natDebug.cc \ - gnu/gcj/util/natGCInfo.cc gnu/java/lang/natMainThread.cc \ - gnu/java/lang/management/natVMClassLoadingMXBeanImpl.cc \ - gnu/java/lang/management/natVMCompilationMXBeanImpl.cc \ - gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.cc \ - gnu/java/lang/management/natVMMemoryMXBeanImpl.cc \ - gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.cc \ - gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc \ - gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc \ - gnu/java/lang/management/natVMRuntimeMXBeanImpl.cc \ - gnu/java/lang/management/natVMThreadMXBeanImpl.cc \ - gnu/java/net/natPlainDatagramSocketImpl.cc \ - gnu/java/net/natPlainSocketImpl.cc \ - gnu/java/net/protocol/core/natCoreInputStream.cc \ - gnu/java/nio/natVMPipe.cc gnu/java/nio/natVMSelector.cc \ - gnu/java/nio/natNIOServerSocket.cc \ - gnu/java/nio/natVMChannel.cc \ - gnu/java/nio/channels/natFileChannelImpl.cc \ - gnu/java/security/jce/prng/natVMSecureRandom.cc \ - java/io/natFile.cc java/io/natVMObjectInputStream.cc \ - java/io/natVMObjectStreamClass.cc java/lang/natCharacter.cc \ - java/lang/natClass.cc java/lang/natClassLoader.cc \ - java/lang/natConcreteProcess.cc java/lang/natVMDouble.cc \ - java/lang/natVMFloat.cc java/lang/natMath.cc \ - java/lang/natObject.cc java/lang/natRuntime.cc \ - java/lang/natString.cc java/lang/natAbstractStringBuffer.cc \ - java/lang/natSystem.cc java/lang/natThread.cc \ - java/lang/natThreadLocal.cc java/lang/natVMClassLoader.cc \ - java/lang/natVMProcess.cc java/lang/natVMThrowable.cc \ - java/lang/ref/natReference.cc java/lang/reflect/natArray.cc \ - java/lang/reflect/natConstructor.cc \ - java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \ - java/lang/reflect/natVMProxy.cc java/net/natVMInetAddress.cc \ - java/net/natVMNetworkInterface.cc \ - java/net/natVMURLConnection.cc \ - java/nio/channels/natVMChannels.cc \ - java/nio/natVMDirectByteBufferImpl.cc \ - java/security/natVMAccessController.cc \ - java/security/natVMAccessControlState.cc \ - java/text/natCollator.cc java/util/natVMTimeZone.cc \ - java/util/concurrent/atomic/natAtomicLong.cc \ - java/util/logging/natLogger.cc java/util/zip/natDeflater.cc \ - java/util/zip/natInflater.cc sun/misc/natUnsafe.cc boehm.cc \ - nogc.cc posix.cc win32.cc darwin.cc posix-threads.cc \ - win32-threads.cc no-threads.cc @INTERPRETER_TRUE@am__objects_2 = jvmti.lo interpret.lo @INTERPRETER_TRUE@am__objects_3 = gnu/classpath/jdwp/natVMFrame.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/natVMMethod.lo \ @@ -498,8 +427,6 @@ am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT) gcj_dbtool_OBJECTS = $(am_gcj_dbtool_OBJECTS) am_gcjh_OBJECTS = gcjh_OBJECTS = $(am_gcjh_OBJECTS) -am__gen_from_JIS_SOURCES_DIST = gnu/gcj/convert/gen-from-JIS.c \ - gnu/gcj/convert/make-trie.c gnu/gcj/convert/make-trie.h @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am_gen_from_JIS_OBJECTS = gnu/gcj/convert/gen-from-JIS.$(OBJEXT) \ @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gnu/gcj/convert/make-trie.$(OBJEXT) gen_from_JIS_OBJECTS = $(am_gen_from_JIS_OBJECTS) @@ -567,18 +494,6 @@ SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_noncore_la_SOURCES) \ $(gnative2ascii_SOURCES) $(gorbd_SOURCES) $(grmic_SOURCES) \ $(grmid_SOURCES) $(grmiregistry_SOURCES) $(gserialver_SOURCES) \ $(gtnameserv_SOURCES) $(jv_convert_SOURCES) -DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \ - $(libgcj_noncore_la_SOURCES) $(libgcj_tools_la_SOURCES) \ - $(am__libgcj_la_SOURCES_DIST) $(EXTRA_libgcj_la_SOURCES) \ - $(libgcj_bc_la_SOURCES) $(libgij_la_SOURCES) \ - $(libjvm_la_SOURCES) $(ecjx_SOURCES) $(gappletviewer_SOURCES) \ - $(gc_analyze_SOURCES) $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \ - $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \ - $(gjar_SOURCES) $(gjarsigner_SOURCES) $(gjavah_SOURCES) \ - $(gjdoc_SOURCES) $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) \ - $(gorbd_SOURCES) $(grmic_SOURCES) $(grmid_SOURCES) \ - $(grmiregistry_SOURCES) $(gserialver_SOURCES) \ - $(gtnameserv_SOURCES) $(jv_convert_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -590,47 +505,10 @@ DATA = $(dbexec_DATA) $(jar_DATA) $(toolexecmainlib_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS ETAGS = etags CTAGS = ctags DIST_SUBDIRS = @DIRLTDL@ gcj include classpath testsuite -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ ANTLR_JAR = @ANTLR_JAR@ @@ -672,6 +550,7 @@ EGREP = @EGREP@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCC_FOR_ECJX = @GCC_FOR_ECJX@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ @@ -823,7 +702,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ extra_ldflags = @extra_ldflags@ -extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_9) +extra_ldflags_libjava = @extra_ldflags_libjava@ gcc_suffix = @gcc_suffix@ gcjsubdir = @gcjsubdir@ gxx_include_dir = @gxx_include_dir@ @@ -1071,6 +950,37 @@ db_pathtail = $(gcjsubdir)/$(db_name) bin_SCRIPTS = contrib/rebuild-gcj-db contrib/aot-compile \ $(am__append_8) GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated + +# The pattern rule necessary to build the *.ver-sun mapfiles is at the end +# of the file, see below. +@ANONVERSCRIPT_FALSE@version_arg = +@ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@version_arg = -Wl,--version-script=$(srcdir)/libgcj.ver +@ANONVERSCRIPT_FALSE@libgcj_la_version_arg = $(version_arg) +@ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@libgcj_la_version_arg = $(version_arg) +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@libgcj_la_version_arg = -Wl,-M,libgcj.ver-sun +@ANONVERSCRIPT_FALSE@libgcj_tools_la_version_arg = $(version_arg) +@ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@libgcj_tools_la_version_arg = $(version_arg) +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@libgcj_tools_la_version_arg = -Wl,-M,libgcj_tools.ver-sun +@ANONVERSCRIPT_FALSE@lib_gnu_awt_xlib_la_version_arg = $(version_arg) +@ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@lib_gnu_awt_xlib_la_version_arg = $(version_arg) +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@lib_gnu_awt_xlib_la_version_arg = -Wl,-M,lib_gnu_awt_xlib.ver-sun +@ANONVERSCRIPT_FALSE@libgcj_bc_la_version_arg = $(version_arg) +@ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@libgcj_bc_la_version_arg = $(version_arg) +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@libgcj_bc_la_version_arg = -Wl,-M,libgcj_bc.ver-sun +@ANONVERSCRIPT_FALSE@version_dep = +@ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@version_dep = $(srcdir)/libgcj.ver +@ANONVERSCRIPT_FALSE@libgcj_la_version_dep = $(version_dep) +@ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@libgcj_la_version_dep = $(version_dep) +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@libgcj_la_version_dep = libgcj.ver-sun +@ANONVERSCRIPT_FALSE@libgcj_tools_la_version_dep = $(version_dep) +@ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@libgcj_tools_la_version_dep = $(version_dep) +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@libgcj_tools_la_version_dep = libgcj_tools.ver-sun +@ANONVERSCRIPT_FALSE@lib_gnu_awt_xlib_la_version_dep = $(version_dep) +@ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@lib_gnu_awt_xlib_la_version_dep = $(version_dep) +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@lib_gnu_awt_xlib_la_version_dep = lib_gnu_awt_xlib.ver-sun +@ANONVERSCRIPT_FALSE@libgcj_bc_la_version_dep = $(version_dep) +@ANONVERSCRIPT_GNU_TRUE@@ANONVERSCRIPT_TRUE@libgcj_bc_la_version_dep = $(version_dep) +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@libgcj_bc_la_version_dep = libgcj_bc.ver-sun LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) GCJLINK = $(LIBTOOL) --tag=GCJ $(LIBTOOLFLAGS) --mode=link $(GCJ) -L$(here) \ $(JC1FLAGS) $(LTLDFLAGS) -o $@ @@ -1111,7 +1021,7 @@ AM_GCJFLAGS = \ --encoding=UTF-8 \ -Wno-deprecated -fbootstrap-classes -AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_10) +AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_9) @SUPPRESS_LIBGCJ_BC_FALSE@LIBGCJ_BC_FLAGS = -findirect-dispatch -fno-indirect-classes @SUPPRESS_LIBGCJ_BC_TRUE@LIBGCJ_BC_FLAGS = @BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE@LIBGCJ_REDUCED_REFLECTION_FLAGS = @@ -1129,7 +1039,7 @@ AM_CPPFLAGS = -I$(top_srcdir) \ BOOTCLASSPATH = $(srcdir)/classpath/lib libgij_la_SOURCES = gij.cc -libgij_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_11) +libgij_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_10) libgij_la_LIBADD = -L$(here)/.libs libgcj.la libgij_la_LDFLAGS = -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) @@ -1139,9 +1049,11 @@ libgij_la_LINK = $(CXXLINK) $(libgij_la_LDFLAGS) @INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \ defineclass.cc verify.cc $(libgcj_interpret_source_files) \ - $(nat_source_files) $(am__append_12) $(am__append_13) \ - $(am__append_14) $(am__append_15) $(am__append_16) \ - $(am__append_17) $(am__append_18) $(am__append_19) + $(nat_source_files) $(am__append_11) $(am__append_12) \ + $(am__append_13) $(am__append_14) $(am__append_15) \ + $(am__append_16) $(am__append_17) $(am__append_18) +@USING_DARWIN_CRT_FALSE@LIBJAVA_LDFLAGS_LIBMATH = -lm +@USING_DARWIN_CRT_TRUE@LIBJAVA_LDFLAGS_LIBMATH = nat_files = $(nat_source_files:.cc=.lo) xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) @@ -1160,20 +1072,24 @@ libgcj_la_LIBADD = \ $(libgcj_la_LIBADD_SUBOBJECTS) \ $(LIBFFI) $(ZLIBS) $(GCLIBS) -libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar java/lang/Object.lo \ - java/lang/Class.lo java/process-$(PLATFORM).lo \ - $(ALL_PACKAGE_SOURCE_FILES_LO) $(LIBLTDL) $(libgcj_la_LIBADD) \ - $(LIBJAVA_CORE_EXTRA) $(am__append_20) -libgcj_la_LINK = $(LIBLINK) $(libgcj_la_LDFLAGS) +libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ + java/lang/Object.lo \ + java/lang/Class.lo \ + java/process-$(PLATFORM).lo \ + $(ALL_PACKAGE_SOURCE_FILES_LO) \ + $(LIBLTDL) $(libgcj_la_LIBADD) \ + $(LIBJAVA_CORE_EXTRA) \ + $(libgcj_la_version_dep) + +libgcj_la_LINK = $(LIBLINK) $(libgcj_la_LDFLAGS) $(libgcj_la_version_arg) EXTRA_libgcj_la_SOURCES = java/lang/Object.java @BUILD_SUBLIBS_TRUE@DLL_VERSION = `expr \`grep -v '^\#' $(srcdir)/libtool-version | sed -e 's/\(.*\):\(.*\):.*/\1 + \2/'\`` @BUILD_SUBLIBS_TRUE@libgcj_noncore_la_SOURCES = @BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LDFLAGS = $(libgcj_la_LDFLAGS) @BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LIBADD = $(libgcj_noncore_la_LIBADD_SUBOBJECTS) libgcj.la -@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_DEPENDENCIES = \ -@BUILD_SUBLIBS_TRUE@ libgcj-$(gcc_version).jar $(LIBLTDL) \ -@BUILD_SUBLIBS_TRUE@ $(libgcj_noncore_la_LIBADD) libgcj.la \ -@BUILD_SUBLIBS_TRUE@ $(am__append_21) +@BUILD_SUBLIBS_TRUE@libgcj_noncore_la_DEPENDENCIES = libgcj-$(gcc_version).jar $(LIBLTDL) \ +@BUILD_SUBLIBS_TRUE@ $(libgcj_noncore_la_LIBADD) libgcj.la $(libgcj_la_version_dep) + @BUILD_SUBLIBS_TRUE@libgcj_noncore_la_LINK = $(libgcj_la_LINK) # We compile libgcj_tools with -findirect-dispatch so that they can @@ -1188,13 +1104,17 @@ libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch \ libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ - $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) + $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) \ + $(LIBJAVA_LDFLAGS_LIBMATH) + +libgcj_tools_la_LIBADD = libgcj.la +libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec \ + $(libgcj_tools_la_version_dep) $(am__append_19) +libgcj_tools_la_LINK = $(LIBLINK) $(libgcj_tools_la_LDFLAGS) \ + $(libgcj_tools_la_version_arg) -libgcj_tools_la_LIBADD = libgcj.la -lm -libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_22) -libgcj_tools_la_LINK = $(LIBLINK) $(libgcj_tools_la_LDFLAGS) libjvm_la_SOURCES = jni-libjvm.cc -libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_23) +libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_20) libjvm_la_LIBADD = -L$(here)/.libs libgcj.la libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC) \ $(LIBJAVA_LDFLAGS_NOUNDEF) @@ -1203,7 +1123,8 @@ libjvm_la_LINK = $(CXXLINK) $(libjvm_la_LDFLAGS) lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files) lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar libgcj.la \ - libgcj.spec $(lib_gnu_awt_xlib_la_LIBADD) $(am__append_24) + libgcj.spec $(lib_gnu_awt_xlib_la_version_dep) \ + $(lib_gnu_awt_xlib_la_LIBADD) $(am__append_21) lib_gnu_awt_xlib_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I../libstdc++-v3/include \ @@ -1215,13 +1136,17 @@ lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \ -rpath $(toolexeclibdir) $(LIBJAVA_LDFLAGS_NOUNDEF) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) -lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS) +lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS) \ + $(lib_gnu_awt_xlib_la_version_arg) + libgcj_bc_la_SOURCES = libgcj_bc.c libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0 \ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) -libgcj_bc_la_DEPENDENCIES = libgcj.la -libgcj_bc_la_LINK = $(LIBLINK) $(libgcj_bc_la_LDFLAGS) +libgcj_bc_la_DEPENDENCIES = libgcj.la $(libgcj_bc_la_version_dep) +libgcj_bc_la_LINK = $(LIBLINK) $(libgcj_bc_la_LDFLAGS) \ + $(libgcj_bc_la_version_arg) + libgcj_bc_dummy_LINK = $(CC) -L$(here)/.libs $(CFLAGS) $(LDFLAGS) -shared \ -fPIC -nostdlib @@ -8481,7 +8406,7 @@ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ jv_convert_LINK = $(GCJLINK) $(jv_convert_LDFLAGS) jv_convert_LDADD = -L$(here)/.libs libgcj.la -jv_convert_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_26) +jv_convert_DEPENDENCIES = libgcj.la libgcj.spec $(am__append_23) gcj_dbtool_SOURCES = \ gnu/gcj/tools/gcj_dbtool/natMain.cc @@ -8491,7 +8416,7 @@ gcj_dbtool_LDFLAGS = --main=gnu.gcj.tools.gcj_dbtool.Main \ gcj_dbtool_LINK = $(GCJLINK) $(gcj_dbtool_LDFLAGS) gcj_dbtool_LDADD = gnu/gcj/tools/gcj_dbtool.lo -L$(here)/.libs libgcj.la gcj_dbtool_DEPENDENCIES = gnu/gcj/tools/gcj_dbtool.lo libgcj.la \ - libgcj.spec $(am__append_27) + libgcj.spec $(am__append_24) gc_analyze_SOURCES = gc_analyze_LDFLAGS = --main=gnu.gcj.tools.gc_analyze.MemoryAnalyze \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) @@ -8499,7 +8424,7 @@ gc_analyze_LDFLAGS = --main=gnu.gcj.tools.gc_analyze.MemoryAnalyze \ gc_analyze_LINK = $(GCJLINK) $(gc_analyze_LDFLAGS) gc_analyze_LDADD = -L$(here)/.libs libgcj-tools.la libgcj.la gc_analyze_DEPENDENCIES = libgcj-tools.la libgcj.la libgcj.spec \ - $(am__append_28) + $(am__append_25) gij_SOURCES = gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \ -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) @@ -8518,10 +8443,10 @@ ECJX_BASE_FLAGS = -findirect-dispatch \ @NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) @NATIVE_FALSE@ecjx_LDADD = @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) \ -@NATIVE_TRUE@ $(am__append_31) +@NATIVE_TRUE@ $(am__append_28) @NATIVE_FALSE@ecjx_DEPENDENCIES = @NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \ -@NATIVE_TRUE@ $(am__append_29) $(am__append_30) +@NATIVE_TRUE@ $(am__append_26) $(am__append_27) gappletviewer_SOURCES = gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) @@ -8738,7 +8663,7 @@ gnu/gcj/xlib/natXImage.cc \ gnu/gcj/xlib/natXUnmapEvent.cc sourcesdir = $(jardir) -headers_to_make = $(nat_headers) $(am__append_32) +headers_to_make = $(nat_headers) $(am__append_29) # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and @@ -10398,182 +10323,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 check-am: all-am check: check-recursive all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) all-multi \ @@ -10766,14 +10515,11 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ clean-binPROGRAMS clean-dbexecLTLIBRARIES clean-generic \ clean-libexecsubPROGRAMS clean-libtool clean-multi \ clean-noinstPROGRAMS clean-toolexeclibLTLIBRARIES ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzma \ - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-local distclean-multi distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-binPROGRAMS \ - install-binSCRIPTS install-data install-data-am \ - install-data-local install-dbexecDATA \ + ctags-recursive distclean distclean-compile distclean-generic \ + distclean-libtool distclean-local distclean-multi \ + distclean-tags dvi dvi-am html html-am info info-am install \ + install-am install-binPROGRAMS install-binSCRIPTS install-data \ + install-data-am install-data-local install-dbexecDATA \ install-dbexecLTLIBRARIES install-dvi install-dvi-am \ install-exec install-exec-am install-exec-hook install-html \ install-html-am install-info install-info-am install-jarDATA \ @@ -10793,6 +10539,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ interpret.lo: AM_CXXFLAGS += -fwrapv +prims.lo: AM_CXXFLAGS += -fno-omit-frame-pointer @BUILD_SUBLIBS_TRUE@libgcj-noncore-dummy.dll.a : $(srcdir)/libgcj-noncore-dummy.def @BUILD_SUBLIBS_TRUE@ $(DLLTOOL) -d $^ -l $@ --dllname cyggcj-noncore-$(DLL_VERSION).dll @@ -12886,6 +12633,8 @@ write-entries-to-file-check: @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ | sed -n -e 's|0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\1, 0x\2, \3) /*\4 */|p' \ @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ >> tmp-0212; \ @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ mv tmp-0212 $(srcdir)/gnu/gcj/convert/JIS0212.h +@NATIVE_FALSE@ecjx.$(OBJEXT): ecjx.cc +@NATIVE_FALSE@ $(GCC_FOR_ECJX) -c $< src.zip: -rm -f src.zip @@ -12979,6 +12728,21 @@ distclean-multi: maintainer-clean-multi: $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean +# This must be at the end of the Makefile, otherwise .SECONDEXPANSION +# causes expansion of filenames with $ in their names, which breaks the build. +# .SECONDEXPANSION is necessary to allow the use of automatic variables ($@ +# in this case) in the requisites of pattern rules. +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@.SECONDEXPANSION: + +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@%.ver-sun : $(srcdir)/libgcj.ver \ +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@ $(top_srcdir)/../contrib/make_sunver.pl \ +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@ $$($$(basename $$@)_la_OBJECTS) $$($$(basename $$@)_la_LIBADD) +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@ perl $(top_srcdir)/../contrib/make_sunver.pl \ +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@ $(srcdir)/libgcj.ver \ +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@ `echo $($(basename $@)_la_OBJECTS) $($(basename $@)_la_LIBADD) | \ +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@ sed 's,\([^/ ]*\)\.l\([ao]\),.libs/\1.\2,g'` \ +@ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@ > $@ || (rm -f $@ ; exit 1) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 71db5159ff7..a7ee39fdc79 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,37 @@ +2010-07-30 Andrew Haley <aph@redhat.com> + + * javax/print/attribute/standard/JobStateReasons.java (add): Fix + infinite recursion with call to super. + +2010-06-04 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * scripts/check_jni_methods.sh.in: Don't use diff -U. + Adapt grep regex, ignore file and problem message. + +2010-06-03 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * configure: Regenerate. + +2010-05-04 Andrew Haley <aph@redhat.com> + + * lib/gen-classlist.sh.in: Use absolute pathnames for all the + directory names in the output file. + +2010-04-27 Andrew Haley <aph@redhat.com> + + * java/util/concurrent/CopyOnWriteArrayList.java: Fix for empty + list. + +2010-04-27 Andrew Haley <aph@redhat.com> + + * gnu/javax/print/ipp/IppResponse.java (parseAttributes): Handle + IppValueTag.UNKNOWN. + * gnu/javax/print/ipp/IppRequest.java (writeOperationAttributes): + Handle RequestedAttributes. + * gnu/javax/print/ipp/IppPrintService.java (processResponse): Add + DocFlavor.SERVICE_FORMATTED.PAGEABLE and + DocFlavor.SERVICE_FORMATTED.PRINTABLE. + 2010-04-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * HACKING: Update required Automake version. diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index b6256a9b159..25a4d4da08f 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,14 @@ +2010-06-21 Jan Kratochvil <jan.kratochvil@redhat.com> + + * doc/Makefile.am (POD2MAN): Provide --date from ChangeLog. + * doc/Makefile.in: Regenerate. + +2010-04-07 Jakub Jelinek <jakub@redhat.com> + + * native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c + (Java_gnu_javax_sound_midi_alsa_AlsaPortDevice_run_1receiver_1thread_1): + Avoid set but not used warning. + 2010-01-09 Jakub Jelinek <jakub@redhat.com> * gnu/java/rmi/registry/RegistryImpl.java (version): Update diff --git a/libjava/classpath/configure b/libjava/classpath/configure index 86e72ca6816..b98c8e84a67 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -914,6 +914,9 @@ enable_rpath with_libiconv_prefix with_x with_qt4dir +with_gmp +with_gmp_include +with_gmp_lib with_javah with_vm_classes enable_maintainer_mode @@ -1654,6 +1657,11 @@ Optional Packages: --with-x use the X Window System --with-qt4dir=DIR Qt4 installation directory used for OS-X. For other systems use pkg-config. + --with-gmp=PATH specify prefix directory for the installed GMP package. + Equivalent to --with-gmp-include=PATH/include + plus --with-gmp-lib=PATH/lib + --with-gmp-include=PATH specify directory for installed GMP include files + --with-gmp-lib=PATH specify directory for the installed GMP library --with-javah specify path or name of a javah-like program --with-vm-classes specify path to VM override source files --with-ecj-jar=ABS.PATH specify jar file containing the Eclipse Java @@ -2304,8 +2312,10 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -$as_echo_n "checking whether $2 is declared... " >&6; } + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else @@ -2315,8 +2325,12 @@ $4 int main () { -#ifndef $2 - (void) $2; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif #endif ; @@ -11804,7 +11818,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11807 "configure" +#line 11821 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11910,7 +11924,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11913 "configure" +#line 11927 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -21906,7 +21920,42 @@ $as_echo "$GTK_LIBS" >&6; } fi - if test "x${COMPILE_GMP}" = xyes; then + +# Check whether --with-gmp was given. +if test "${with_gmp+set}" = set; then : + withval=$with_gmp; +fi + + +# Check whether --with-gmp_include was given. +if test "${with_gmp_include+set}" = set; then : + withval=$with_gmp_include; +fi + + +# Check whether --with-gmp_lib was given. +if test "${with_gmp_lib+set}" = set; then : + withval=$with_gmp_lib; +fi + + + if test "x$with_gmp" != x; then + gmplibs=-lgmp + gmpinc= + gmplibs="-L$with_gmp/lib $gmplibs" + gmpinc="-I$with_gmp/include $gmpinc" + if test "x$with_gmp_include" != x; then + gmpinc="-I$with_gmp_include $gmpinc" + fi + if test "x$with_gmp_lib" != x; then + gmplibs="-L$with_gmp_lib $gmplibs" + fi + else + gmplibs="-lgmp" + gmpinc="-I/usr/include" + fi + + if test "x${COMPILE_GMP}" = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_mul_si in -lgmp" >&5 $as_echo_n "checking for __gmpz_mul_si in -lgmp... " >&6; } if test "${ac_cv_lib_gmp___gmpz_mul_si+set}" = set; then : @@ -21947,8 +21996,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_mul_si" >&5 $as_echo "$ac_cv_lib_gmp___gmpz_mul_si" >&6; } if test "x$ac_cv_lib_gmp___gmpz_mul_si" = x""yes; then : - GMP_CFLAGS=-I/usr/include - GMP_LIBS=-lgmp + GMP_CFLAGS="$gmpinc" + GMP_LIBS="$gmplibs" else GMP_CFLAGS= GMP_LIBS= @@ -23685,7 +23734,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 23688: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 23737: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -23830,7 +23879,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 23833 "configure" */ +/* #line 23882 "configure" */ package java.lang; public class Object @@ -23877,7 +23926,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 23880 "configure" */ +/* [#]line 23929 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -24203,7 +24252,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 24206 "configure" */ +/* #line 24255 "configure" */ package java.lang; public class Object @@ -24242,7 +24291,7 @@ fi JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST - /* #line 24245 "configure" */ + /* #line 24294 "configure" */ public class Test { public static void main(String args) diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index 98a17f8139a..d2d149fe239 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -812,10 +812,32 @@ if test "x${COMPILE_JNI}" = xyes; then dnl __gmpz_mul_si for earlier versions (>= 3.1). dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to dnl change the name of the corresponding ac_ variable on lines 860... + AC_ARG_WITH(gmp, [ --with-gmp=PATH specify prefix directory for the installed GMP package. + Equivalent to --with-gmp-include=PATH/include + plus --with-gmp-lib=PATH/lib]) + AC_ARG_WITH(gmp_include, [ --with-gmp-include=PATH specify directory for installed GMP include files]) + AC_ARG_WITH(gmp_lib, [ --with-gmp-lib=PATH specify directory for the installed GMP library]) + + if test "x$with_gmp" != x; then + gmplibs=-lgmp + gmpinc= + gmplibs="-L$with_gmp/lib $gmplibs" + gmpinc="-I$with_gmp/include $gmpinc" + if test "x$with_gmp_include" != x; then + gmpinc="-I$with_gmp_include $gmpinc" + fi + if test "x$with_gmp_lib" != x; then + gmplibs="-L$with_gmp_lib $gmplibs" + fi + else + gmplibs="-lgmp" + gmpinc="-I/usr/include" + fi + if test "x${COMPILE_GMP}" = xyes; then AC_CHECK_LIB(gmp, __gmpz_mul_si, - [GMP_CFLAGS=-I/usr/include - GMP_LIBS=-lgmp ], + [GMP_CFLAGS="$gmpinc" + GMP_LIBS="$gmplibs" ], [GMP_CFLAGS= GMP_LIBS= ]) AC_SUBST(GMP_CFLAGS) diff --git a/libjava/classpath/doc/Makefile.am b/libjava/classpath/doc/Makefile.am index aca54315859..a5f19b7e5da 100644 --- a/libjava/classpath/doc/Makefile.am +++ b/libjava/classpath/doc/Makefile.am @@ -31,7 +31,7 @@ TOOLS_MANFILES = \ gtnameserv.1 \ gjdoc.1 -POD2MAN = pod2man --center="GNU" --release="$(VERSION)" +POD2MAN = pod2man --center="GNU" --release="$(VERSION)" --date=$(shell sed -n '1s/ .*//p' <$(srcdir)/../ChangeLog) TEXI2POD = perl $(srcdir)/texi2pod.pl STAMP = echo timestamp > diff --git a/libjava/classpath/doc/Makefile.in b/libjava/classpath/doc/Makefile.in index 9055bb2bcbf..f5955e12234 100644 --- a/libjava/classpath/doc/Makefile.in +++ b/libjava/classpath/doc/Makefile.in @@ -376,7 +376,7 @@ TOOLS_MANFILES = \ gtnameserv.1 \ gjdoc.1 -POD2MAN = pod2man --center="GNU" --release="$(VERSION)" +POD2MAN = pod2man --center="GNU" --release="$(VERSION)" --date=$(shell sed -n '1s/ .*//p' <$(srcdir)/../ChangeLog) TEXI2POD = perl $(srcdir)/texi2pod.pl STAMP = echo timestamp > @GENINSRC_FALSE@STAMP_GENINSRC = diff --git a/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java b/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java index ce3ef9e1538..56a41381fb6 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java @@ -356,8 +356,17 @@ public class IppPrintService implements PrintService // should not happen, all fields are public } } + + if (this.getClass() + .isAssignableFrom(gnu.javax.print.CupsPrintService.class)) + { +// CUPS always provides filters to convert from Postscript. +// This logic looks odd, but it's what OpenJDK does. + flavors.add(DocFlavor.SERVICE_FORMATTED.PAGEABLE); + flavors.add(DocFlavor.SERVICE_FORMATTED.PRINTABLE); + } } - + // printer uris Set uris = getPrinterAttributeSet(PrinterUriSupported.class); printerUris = new ArrayList(uris.size()); diff --git a/libjava/classpath/gnu/javax/print/ipp/IppRequest.java b/libjava/classpath/gnu/javax/print/ipp/IppRequest.java index 3de88715a68..869f8224be9 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppRequest.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppRequest.java @@ -434,6 +434,8 @@ public class IppRequest PrinterURI printerUri = (PrinterURI) attributes.get(PrinterURI.class); JobUri jobUri = (JobUri) attributes.get(JobUri.class); JobId jobId = (JobId) attributes.get(JobId.class); + RequestedAttributes reqAttrs + = (RequestedAttributes)attributes.get(RequestedAttributes.class); if (printerUri != null && jobId == null && jobUri == null) { write(printerUri); @@ -467,6 +469,12 @@ public class IppRequest logger.log(Component.IPP, "Attribute: Name: <" + jobUri.getCategory() .getName() + "> Value: <" + jobUri.toString() + ">"); } + else if (reqAttrs != null) + { + write(reqAttrs); + attributes.remove(RequestedAttributes.class); + logger.log(Component.IPP, "RequestedAttributes: <" + reqAttrs + ">"); + } else { throw new IppException("Unknown target operation attribute combination."); diff --git a/libjava/classpath/gnu/javax/print/ipp/IppResponse.java b/libjava/classpath/gnu/javax/print/ipp/IppResponse.java index 21784d0f076..81a1eb47b03 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppResponse.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppResponse.java @@ -302,11 +302,14 @@ public class IppResponse // out-of-band values case IppValueTag.UNSUPPORTED: case IppValueTag.UNKNOWN: - case IppValueTag.NO_VALUE: // TODO implement out-of-band handling - // We currently throw an exception to see when it occurs - not yet :-) - throw new IppException( - "Unexpected name value for out-of-band value tag"); + // We currently throw an exception to see when it occurs - not yet :-) + throw new IppException( + "Unexpected name value for out-of-band value tag " + tag); + case IppValueTag.NO_VALUE: + attribute = null; + + break; case IppValueTag.INTEGER: int intValue = IppUtilities.convertToInt(value); attribute = IppUtilities.getIntegerAttribute(name, intValue); diff --git a/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java b/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java index 6e4fb9a8ac9..02071829269 100644 --- a/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java +++ b/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java @@ -452,7 +452,12 @@ public class CopyOnWriteArrayList<E> public synchronized boolean remove(Object element) { E[] snapshot = this.data; - E[] newData = (E[]) new Object[snapshot.length - 1]; + int len = snapshot.length; + + if (len == 0) + return false; + + E[] newData = (E[]) new Object[len - 1]; // search the element to remove while filling the backup array // this way we can run this method in O(n) diff --git a/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java b/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java index 503c06c0290..6c7a9f4aad4 100644 --- a/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java +++ b/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java @@ -129,7 +129,7 @@ public final class JobStateReasons extends HashSet<JobStateReason> if (o == null) throw new NullPointerException("reason is null"); - return add(o); + return super.add(o); } /** diff --git a/libjava/classpath/lib/gen-classlist.sh.in b/libjava/classpath/lib/gen-classlist.sh.in index 1768c15c7fb..a0971ff63b0 100755 --- a/libjava/classpath/lib/gen-classlist.sh.in +++ b/libjava/classpath/lib/gen-classlist.sh.in @@ -7,13 +7,17 @@ LC_ALL=C; export LC_ALL LANG=C; export LANG -echo "Adding java source files from srcdir '@top_srcdir@'." +abs_top_builddir=`cd "${top_builddir}"; pwd` +abs_top_srcdir=`cd "@top_srcdir@"; pwd` + +echo "Adding java source files from srcdir '${abs_top_srcdir}'." + # We construct 'classes.1' as a series of lines. Each line # has three fields, which are separated by spaces. The first # field is the package of this class (separated by "/"s). -# The second field is the name of the top-level directory for -# this file, relative to the build directory. E.g., it might -# look like "../../classpath/vm/reference". +# The second field is the absolute pathname of the top-level directory +# for this file. E.g., it might look like +# "/home/jezebel/classpath/vm/reference". # The third field is the file name, like "java/lang/Object.java". # We do this because it makes splitting for the gcj build much # cheaper. @@ -21,15 +25,15 @@ echo "Adding java source files from srcdir '@top_srcdir@'." @FIND@ java javax gnu org sun -follow -name '*.java' -print | sort -r | sed -e 's,/\([^/]*\)$, \1,' | while read pkg file; do - echo $pkg @top_srcdir@ $pkg/$file + echo $pkg ${abs_top_srcdir} $pkg/$file done) > ${top_builddir}/lib/classes.1 # The same, but for the external code. for dir in \ - @top_srcdir@/external/w3c_dom \ - @top_srcdir@/external/sax \ - @top_srcdir@/external/relaxngDatatype \ - @top_srcdir@/external/jsr166 \ + ${abs_top_srcdir}/external/w3c_dom \ + ${abs_top_srcdir}/external/sax \ + ${abs_top_srcdir}/external/relaxngDatatype \ + ${abs_top_srcdir}/external/jsr166 \ ; do (cd $dir for subdir in java javax gnu org sun; do @@ -62,8 +66,6 @@ for dir in $vm_dirlist; do done # Only include generated files once. -abs_top_builddir=`cd "${top_builddir}"; pwd` -abs_top_srcdir=`cd "@top_srcdir@"; pwd` if test "$abs_top_builddir" != "$abs_top_srcdir"; then echo "Adding generated files in builddir '${top_builddir}'." # Currently the only generated files are in gnu.*. diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class Binary files differindex c44e1cf7f15..7ec693ef159 100644 --- a/libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class +++ b/libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class Binary files differindex c4e62948ad1..a7697f9415a 100644 --- a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class +++ b/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class Binary files differindex aadef6cb135..039067c89a4 100644 --- a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class +++ b/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class Binary files differindex 2d0d8045d7e..89113302b68 100644 --- a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class +++ b/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class Binary files differindex 0653dc80c97..995c0e1441f 100644 --- a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class +++ b/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse.class diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class Binary files differindex 2dba6818fd6..a8f5b0acb70 100644 --- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class +++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$1.class diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class Binary files differindex 03ab92a5ec1..2ac97190710 100644 --- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class +++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$2.class diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class Binary files differindex 1f2e00af9ba..c20c1fecf97 100644 --- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class +++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$3.class diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class Binary files differindex 83fd284ec57..df5d0783cd3 100644 --- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class +++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.class diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class Binary files differindex 572a880ad34..12650197072 100644 --- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class +++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList$SubList.class diff --git a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class Binary files differindex 0e7bd0f5aee..97d63d83b3f 100644 --- a/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class +++ b/libjava/classpath/lib/java/util/concurrent/CopyOnWriteArrayList.class diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class b/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class Binary files differindex f9cc7b3e866..5668b666461 100644 --- a/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class +++ b/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class diff --git a/libjava/classpath/native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c b/libjava/classpath/native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c index f4f8dd84a06..d3e4f2b45a0 100644 --- a/libjava/classpath/native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c +++ b/libjava/classpath/native/jni/midi-alsa/gnu_javax_sound_midi_alsa_AlsaPortDevice.c @@ -1,5 +1,5 @@ /* gnu_javax_sound_midi_alsa_AlsaPortDevice.c - Native support - Copyright (C) 2005 + Copyright (C) 2005, 2010 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,6 @@ Java_gnu_javax_sound_midi_alsa_AlsaPortDevice_run_1receiver_1thread_1 (JNIEnv *env, jobject this __attribute__((unused)), jlong client, jlong port, jobject receiver) { - int rc; snd_seq_port_info_t *pinfo, *sinfo; snd_seq_port_subscribe_t *subs; snd_seq_addr_t sender, dest; @@ -58,12 +57,12 @@ Java_gnu_javax_sound_midi_alsa_AlsaPortDevice_run_1receiver_1thread_1 snd_seq_port_info_alloca (&sinfo); snd_seq_port_subscribe_alloca (&subs); - rc = snd_seq_open (&seq, "default", SND_SEQ_OPEN_DUPLEX, SND_SEQ_NONBLOCK); + snd_seq_open (&seq, "default", SND_SEQ_OPEN_DUPLEX, SND_SEQ_NONBLOCK); snd_seq_port_info_set_capability (pinfo, SND_SEQ_PORT_CAP_WRITE); snd_seq_port_info_set_type (pinfo, SND_SEQ_PORT_TYPE_MIDI_GENERIC); - rc = snd_seq_create_port (seq, pinfo); + snd_seq_create_port (seq, pinfo); sender.client = (int) client; sender.port = (int) port; @@ -72,7 +71,7 @@ Java_gnu_javax_sound_midi_alsa_AlsaPortDevice_run_1receiver_1thread_1 snd_seq_port_subscribe_set_sender (subs, &sender); snd_seq_port_subscribe_set_dest (subs, &dest); - rc = snd_seq_subscribe_port(seq, subs); + snd_seq_subscribe_port(seq, subs); { int npfd; diff --git a/libjava/classpath/scripts/check_jni_methods.sh.in b/libjava/classpath/scripts/check_jni_methods.sh.in index cf300941876..facf34b345b 100644 --- a/libjava/classpath/scripts/check_jni_methods.sh.in +++ b/libjava/classpath/scripts/check_jni_methods.sh.in @@ -36,23 +36,23 @@ rm $TMPFILE3 # Write temporary ignore file. cat > $TMPFILE3 << EOF --Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose --Java_java_lang_VMSystem_arraycopy --Java_java_lang_VMSystem_identityHashCode +< Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose +< Java_java_lang_VMSystem_arraycopy +< Java_java_lang_VMSystem_identityHashCode EOF # Compare again silently. # Use fgrep and direct the output to /dev/null for compatibility with older # grep instead of using the non portable -q. -if diff -U 0 $TMPFILE $TMPFILE2 | grep '^[+-]Java' | \ +if diff $TMPFILE $TMPFILE2 | grep '^[<>] Java' | \ fgrep -v -f $TMPFILE3 > /dev/null; then PROBLEM=1 echo "Found a problem with the JNI methods declared and implemented." - echo "(-) missing in implementation, (+) missing in header files" + echo "(<) missing in implementation, (>) missing in header files" # Compare the found method lists. - diff -U 0 $TMPFILE $TMPFILE2 | grep '^[+-]Java' | fgrep -v -f $TMPFILE3 + diff $TMPFILE $TMPFILE2 | grep '^[<>] Java' | fgrep -v -f $TMPFILE3 fi # Cleanup. diff --git a/libjava/configure b/libjava/configure index ca3329d3944..8fa4baffd68 100755 --- a/libjava/configure +++ b/libjava/configure @@ -599,6 +599,7 @@ ac_includes_default="\ #endif" enable_option_checking=no +ac_c_werror_flag= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -631,6 +632,10 @@ python_mod_dir here LD_FINISH_STATIC_SPEC LD_START_STATIC_SPEC +ANONVERSCRIPT_SUN_FALSE +ANONVERSCRIPT_SUN_TRUE +ANONVERSCRIPT_GNU_FALSE +ANONVERSCRIPT_GNU_TRUE ANONVERSCRIPT_FALSE ANONVERSCRIPT_TRUE SYSDEP_SOURCES @@ -768,6 +773,7 @@ LIBLTDL INCLTDL host_exeext GCJH +GCC_FOR_ECJX GCJ_FOR_ECJX X_AWT_FALSE X_AWT_TRUE @@ -2314,8 +2320,10 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -$as_echo_n "checking whether $2 is declared... " >&6; } + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else @@ -2325,8 +2333,12 @@ $4 int main () { -#ifndef $2 - (void) $2; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif #endif ; @@ -6692,7 +6704,8 @@ NATIVE=yes # Which gcj and host gcj (for ecjx) do we use? which_gcj=default host_exeext=${ac_exeext} -GCJ_FOR_ECJX= +GCJ_FOR_ECJX='$(GCJ)' +GCC_FOR_ECJX='$(CXX)' built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`" if test -n "${with_cross_host}"; then # We are being configured with a cross compiler. We can't @@ -6700,6 +6713,7 @@ if test -n "${with_cross_host}"; then NATIVE=no cross_host_exeext= GCJ_FOR_ECJX="${with_cross_host}-gcj" + GCC_FOR_ECJX="${with_cross_host}-gcc" case "${with_cross_host}" in *mingw* | *cygwin*) cross_host_exeext=.exe @@ -6768,6 +6782,7 @@ export JAVAC + # Create it, so that compile/link tests don't fail test -f libgcj.spec || touch libgcj.spec @@ -13338,7 +13353,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13341 "configure" +#line 13356 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13444,7 +13459,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13447 "configure" +#line 13462 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19423,7 +19438,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19426 "configure" +#line 19441 "configure" struct S { ~S(); }; void bar(); void foo() @@ -19754,7 +19769,7 @@ case "${host}" in fi ;; *-*-darwin[912]*) - SYSTEMSPEC="-allow_stack_execute" + SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" ;; *) SYSTEMSPEC= @@ -20520,6 +20535,48 @@ arm*linux*eabi) ;; esac +# Check for --no-merge-exidx-entries, an ARM-specific linker option. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --no-merge-exidx-entries" >&5 +$as_echo_n "checking for --no-merge-exidx-entries... " >&6; } +if test "${libgcj_cv_exidx+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + saved_ldflags="$LDFLAGS" + LDFLAGS="${LDFLAGS} -Wl,--no-merge-exidx-entries" + # The IRIX 6 ld doesn't recognize --no-merge-exidx-entries, but only + # warns about unknown options, which breaks the testsuite. So enable + # AC_LANG_WERROR, but there's currently (autoconf 2.64) no way to turn + # it off again. As a workaround, save and restore werror flag like + # AC_PATH_XTRA. + ac_xsave_c_werror_flag=$ac_c_werror_flag + +ac_c_werror_flag=yes + if test x$gcc_no_link = xyes; then + as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 +fi +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(void){ return 0;} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "libgcj_cv_exidx=yes" +else + eval "libgcj_cv_exidx=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag + LDFLAGS="${saved_ldflags}" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgcj_cv_exidx" >&5 +$as_echo "$libgcj_cv_exidx" >&6; } +if test "${libgcj_cv_exidx}" = "yes"; then + SYSTEMSPEC="${SYSTEMSPEC} --no-merge-exidx-entries" + extra_ldflags="${extra_ldflags} -Wl,--no-merge-exidx-entries" +fi + + @@ -20659,6 +20716,23 @@ case "$THREADS" in THREADLIBS='-lpthread -lrt' THREADSPEC='-lpthread -lrt' ;; + *-*-solaris2.8) + # Always use alternate thread library on Solaris 8. Need libthread + # for TLS support. + # Need -Wl,-R to get it through libtool ... + THREADLIBS='-L/usr/lib/lwp$(MULTISUBDIR) -Wl,-R -Wl,/usr/lib/lwp$(MULTISUBDIR) -lpthread -lthread' + # ... while ld only accepts -R. + THREADSPEC='-L/usr/lib/lwp%{m64:/64} -R/usr/lib/lwp%{m64:/64} -lpthread -lthread' + ;; + *-*-solaris2.9) + # As on Solaris 8, need libthread for TLS support. + THREADLIBS='-lpthread -lthread' + THREADSPEC='-lpthread -lthread' + ;; + *-*-darwin*) + # Don't set THREADLIBS or THREADSPEC as Darwin already + # provides pthread via libSystem. + ;; *) THREADLIBS=-lpthread THREADSPEC=-lpthread @@ -23036,6 +23110,8 @@ fi # libgcj.spec is used, so override here SYSTEMSPEC="$SYSTEMSPEC %{!mabi=64:-ldl}" ;; + *-*-darwin*) + ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5 $as_echo_n "checking for main in -ldl... " >&6; } @@ -24107,8 +24183,8 @@ case "${host}" in i?86-*-linux*) SIGNAL_HANDLER=include/i386-signal.h ;; - sparc*-sun-solaris*) - SIGNAL_HANDLER=include/sparc-signal.h + *-*-solaris2*) + SIGNAL_HANDLER=include/solaris-signal.h ;; # ia64-*) # SYSDEP_SOURCES=sysdep/ia64.c @@ -24331,7 +24407,7 @@ rm -f core conftest.err conftest.$ac_objext \ CFLAGS="$chktls_save_CFLAGS" if test "X$thread_CFLAGS" != Xfailed; then CFLAGS="$thread_CFLAGS $chktls_save_CFLAGS" - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "cannot run test program while cross compiling @@ -24341,7 +24417,7 @@ else /* end confdefs.h. */ #include <pthread.h> __thread int a; - static int *a_in_other_thread; + static int *volatile a_in_other_thread; static void * thread_func (void *arg) { @@ -24353,11 +24429,11 @@ main () { pthread_t thread; void *thread_retval; - int *a_in_main_thread; + int *volatile a_in_main_thread; + a_in_main_thread = &a; if (pthread_create (&thread, (pthread_attr_t *)0, thread_func, (void *)0)) return 0; - a_in_main_thread = &a; if (pthread_join (thread, &thread_retval)) return 0; return (a_in_other_thread == a_in_main_thread); @@ -24439,7 +24515,8 @@ if test "${libjava_cv_anon_version_script+set}" = set; then : else save_CFLAGS="$CFLAGS"; save_LDFLAGS="$LDFLAGS" libjava_cv_anon_version_script=no - CFLAGS="$CFLAGS -fPIC"; LDFLAGS="$LDFLAGS -shared -Wl,--version-script,conftest.map" + CFLAGS="$CFLAGS -fPIC"; + LDFLAGS="$LDFLAGS -shared -Wl,--version-script,conftest.map" echo '{ global: globalsymb*; local: *; };' > conftest.map if test x$gcc_no_link = xyes; then as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 @@ -24456,16 +24533,45 @@ main () } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - libjava_cv_anon_version_script=yes + libjava_cv_anon_version_script=gnu fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + if test x$libjava_cv_anon_version_script = xno; then + case "$target_os" in + solaris2*) + LDFLAGS="$save_LDFLAGS" + LDFLAGS="$LDFLAGS -shared -Wl,-M,conftest.map" + # Sun ld doesn't understand wildcards here. + echo '{ global: globalsymbol; local: *; };' > conftest.map + if test x$gcc_no_link = xyes; then + as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 +fi +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void globalsymbol (void) {} void localsymbol (void) {} +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + libjava_cv_anon_version_script=sun +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ;; + esac + fi CFLAGS="$save_CFLAGS"; LDFLAGS="$save_LDFLAGS" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libjava_cv_anon_version_script" >&5 $as_echo "$libjava_cv_anon_version_script" >&6; } - if test "$libjava_cv_anon_version_script" = yes; then + if test "$libjava_cv_anon_version_script" != no; then ANONVERSCRIPT_TRUE= ANONVERSCRIPT_FALSE='#' else @@ -24473,12 +24579,28 @@ else ANONVERSCRIPT_FALSE= fi + if test "$libjava_cv_anon_version_script" = gnu; then + ANONVERSCRIPT_GNU_TRUE= + ANONVERSCRIPT_GNU_FALSE='#' +else + ANONVERSCRIPT_GNU_TRUE='#' + ANONVERSCRIPT_GNU_FALSE= +fi + + if test "$libjava_cv_anon_version_script" = sun; then + ANONVERSCRIPT_SUN_TRUE= + ANONVERSCRIPT_SUN_FALSE='#' +else + ANONVERSCRIPT_SUN_TRUE='#' + ANONVERSCRIPT_SUN_FALSE= +fi + # Check if linker supports static linking on a per library basis LD_START_STATIC_SPEC= LD_FINISH_STATIC_SPEC= -if $LD --help 2>&1 | grep -q -e -call_shared ; then - if $LD --help 2>&1 | grep -q -e -non_shared ; then +if $LD --help 2>&1 | grep -- -call_shared >/dev/null 2>&1; then + if $LD --help 2>&1 | grep -- -non_shared >/dev/null 2>&1; then LD_START_STATIC_SPEC='%{static-libgcj:-non_shared}' LD_FINISH_STATIC_SPEC='%{static-libgcj:-call_shared}' fi @@ -25012,6 +25134,14 @@ if test -z "${ANONVERSCRIPT_TRUE}" && test -z "${ANONVERSCRIPT_FALSE}"; then as_fn_error "conditional \"ANONVERSCRIPT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ANONVERSCRIPT_GNU_TRUE}" && test -z "${ANONVERSCRIPT_GNU_FALSE}"; then + as_fn_error "conditional \"ANONVERSCRIPT_GNU\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${ANONVERSCRIPT_SUN_TRUE}" && test -z "${ANONVERSCRIPT_SUN_FALSE}"; then + as_fn_error "conditional \"ANONVERSCRIPT_SUN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${INSTALL_AOT_RPM_TRUE}" && test -z "${INSTALL_AOT_RPM_FALSE}"; then as_fn_error "conditional \"INSTALL_AOT_RPM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/libjava/configure.ac b/libjava/configure.ac index 255fb64595e..df6bca3f662 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -151,7 +151,7 @@ AC_PROG_CC AC_PROG_CXX CXXFLAGS="$save_CXXFLAGS" -AM_INIT_AUTOMAKE([1.9.0]) +AM_INIT_AUTOMAKE([no-dist 1.9.0]) AC_CHECK_TOOL(AS, as) AC_CHECK_TOOL(LD, ld) @@ -394,7 +394,8 @@ NATIVE=yes # Which gcj and host gcj (for ecjx) do we use? which_gcj=default host_exeext=${ac_exeext} -GCJ_FOR_ECJX= +GCJ_FOR_ECJX='$(GCJ)' +GCC_FOR_ECJX='$(CXX)' built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`" if test -n "${with_cross_host}"; then # We are being configured with a cross compiler. We can't @@ -402,6 +403,7 @@ if test -n "${with_cross_host}"; then NATIVE=no cross_host_exeext= GCJ_FOR_ECJX="${with_cross_host}-gcj" + GCC_FOR_ECJX="${with_cross_host}-gcc" case "${with_cross_host}" in *mingw* | *cygwin*) cross_host_exeext=.exe @@ -467,6 +469,7 @@ JAVAC="$GCJ -C" export JAVAC AC_SUBST(GCJ_FOR_ECJX) +AC_SUBST(GCC_FOR_ECJX) AC_SUBST(GCJH) AC_SUBST(host_exeext) @@ -883,7 +886,7 @@ case "${host}" in fi ;; *-*-darwin[[912]]*) - SYSTEMSPEC="-allow_stack_execute" + SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}" ;; *) SYSTEMSPEC= @@ -927,6 +930,29 @@ arm*linux*eabi) extra_ldflags_libjava=-liconv ;; esac + +# Check for --no-merge-exidx-entries, an ARM-specific linker option. +AC_CACHE_CHECK([for --no-merge-exidx-entries], [libgcj_cv_exidx], + [saved_ldflags="$LDFLAGS" + LDFLAGS="${LDFLAGS} -Wl,--no-merge-exidx-entries" + # The IRIX 6 ld doesn't recognize --no-merge-exidx-entries, but only + # warns about unknown options, which breaks the testsuite. So enable + # AC_LANG_WERROR, but there's currently (autoconf 2.64) no way to turn + # it off again. As a workaround, save and restore werror flag like + # AC_PATH_XTRA. + ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag=$ac_[]_AC_LANG_ABBREV[]_werror_flag + AC_LANG_WERROR + AC_LINK_IFELSE([int main(void){ return 0;} ], + [eval "libgcj_cv_exidx=yes"], + [eval "libgcj_cv_exidx=no"]) + ac_[]_AC_LANG_ABBREV[]_werror_flag=$ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag + LDFLAGS="${saved_ldflags}"] +) +if test "${libgcj_cv_exidx}" = "yes"; then + SYSTEMSPEC="${SYSTEMSPEC} --no-merge-exidx-entries" + extra_ldflags="${extra_ldflags} -Wl,--no-merge-exidx-entries" +fi + AC_SUBST(extra_ldflags_libjava) AC_SUBST(extra_ldflags) AC_SUBST(LIBSTDCXXSPEC) @@ -1041,6 +1067,23 @@ case "$THREADS" in THREADLIBS='-lpthread -lrt' THREADSPEC='-lpthread -lrt' ;; + *-*-solaris2.8) + # Always use alternate thread library on Solaris 8. Need libthread + # for TLS support. + # Need -Wl,-R to get it through libtool ... + THREADLIBS='-L/usr/lib/lwp$(MULTISUBDIR) -Wl,-R -Wl,/usr/lib/lwp$(MULTISUBDIR) -lpthread -lthread' + # ... while ld only accepts -R. + THREADSPEC='-L/usr/lib/lwp%{m64:/64} -R/usr/lib/lwp%{m64:/64} -lpthread -lthread' + ;; + *-*-solaris2.9) + # As on Solaris 8, need libthread for TLS support. + THREADLIBS='-lpthread -lthread' + THREADSPEC='-lpthread -lthread' + ;; + *-*-darwin*) + # Don't set THREADLIBS or THREADSPEC as Darwin already + # provides pthread via libSystem. + ;; *) THREADLIBS=-lpthread THREADSPEC=-lpthread @@ -1409,6 +1452,8 @@ else # libgcj.spec is used, so override here SYSTEMSPEC="$SYSTEMSPEC %{!mabi=64:-ldl}" ;; + *-*-darwin*) + ;; *) AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl") ;; @@ -1657,8 +1702,8 @@ case "${host}" in i?86-*-linux*) SIGNAL_HANDLER=include/i386-signal.h ;; - sparc*-sun-solaris*) - SIGNAL_HANDLER=include/sparc-signal.h + *-*-solaris2*) + SIGNAL_HANDLER=include/solaris-signal.h ;; # ia64-*) # SYSDEP_SOURCES=sysdep/ia64.c @@ -1744,19 +1789,34 @@ AC_CACHE_CHECK([whether ld supports anonymous version scripts], [libjava_cv_anon_version_script], [save_CFLAGS="$CFLAGS"; save_LDFLAGS="$LDFLAGS" libjava_cv_anon_version_script=no - CFLAGS="$CFLAGS -fPIC"; LDFLAGS="$LDFLAGS -shared -Wl,--version-script,conftest.map" + CFLAGS="$CFLAGS -fPIC"; + LDFLAGS="$LDFLAGS -shared -Wl,--version-script,conftest.map" echo '{ global: globalsymb*; local: *; };' > conftest.map AC_TRY_LINK(void globalsymbol (void) {} void localsymbol (void) {},, - [libjava_cv_anon_version_script=yes], []) + [libjava_cv_anon_version_script=gnu], []) + if test x$libjava_cv_anon_version_script = xno; then + case "$target_os" in + solaris2*) + LDFLAGS="$save_LDFLAGS" + LDFLAGS="$LDFLAGS -shared -Wl,-M,conftest.map" + # Sun ld doesn't understand wildcards here. + echo '{ global: globalsymbol; local: *; };' > conftest.map + AC_TRY_LINK(void globalsymbol (void) {} void localsymbol (void) {},, + [libjava_cv_anon_version_script=sun], []) + ;; + esac + fi CFLAGS="$save_CFLAGS"; LDFLAGS="$save_LDFLAGS" ]) -AM_CONDITIONAL(ANONVERSCRIPT, test "$libjava_cv_anon_version_script" = yes) +AM_CONDITIONAL(ANONVERSCRIPT, test "$libjava_cv_anon_version_script" != no) +AM_CONDITIONAL(ANONVERSCRIPT_GNU, test "$libjava_cv_anon_version_script" = gnu) +AM_CONDITIONAL(ANONVERSCRIPT_SUN, test "$libjava_cv_anon_version_script" = sun) # Check if linker supports static linking on a per library basis LD_START_STATIC_SPEC= LD_FINISH_STATIC_SPEC= -if $LD --help 2>&1 | grep -q -e -call_shared ; then - if $LD --help 2>&1 | grep -q -e -non_shared ; then +if $LD --help 2>&1 | grep -- -call_shared >/dev/null 2>&1; then + if $LD --help 2>&1 | grep -- -non_shared >/dev/null 2>&1; then LD_START_STATIC_SPEC='%{static-libgcj:-non_shared}' LD_FINISH_STATIC_SPEC='%{static-libgcj:-call_shared}' fi diff --git a/libjava/configure.host b/libjava/configure.host index 460ef2fab07..665fbe3c6a0 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -318,6 +318,9 @@ EOF DIVIDESPEC=-fuse-divide-subroutine CHECKREFSPEC=-fcheck-references ;; + i?86-*-solaris2*) + can_unwind_signal=yes + ;; *-*-freebsd*) slow_pthread_self= ;; diff --git a/libjava/exception.cc b/libjava/exception.cc index 8affbbe9fdf..76f145112ff 100644 --- a/libjava/exception.cc +++ b/libjava/exception.cc @@ -1,6 +1,6 @@ // Functions for Exception Support for Java. -/* Copyright (C) 1998, 1999, 2001, 2002, 2006 Free Software Foundation +/* Copyright (C) 1998, 1999, 2001, 2002, 2006, 2010 Free Software Foundation This file is part of libgcj. @@ -111,11 +111,10 @@ _Jv_Throw (jthrowable value) /* We're happy with setjmp/longjmp exceptions or region-based exception handlers: entry points are provided here for both. */ - _Unwind_Reason_Code code; #ifdef SJLJ_EXCEPTIONS - code = _Unwind_SjLj_RaiseException (&xh->unwindHeader); + _Unwind_SjLj_RaiseException (&xh->unwindHeader); #else - code = _Unwind_RaiseException (&xh->unwindHeader); + _Unwind_RaiseException (&xh->unwindHeader); #endif /* If code == _URC_END_OF_STACK, then we reached top of stack without diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index dd17e554222..b2f6f149174 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -36,9 +36,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = gcj -DIST_COMMON = $(gcj_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/libgcj-config.h.in \ - $(toolgcj_HEADERS) +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/libgcj-config.h.in $(gcj_HEADERS) $(toolgcj_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \ $(top_srcdir)/../config/acx.m4 \ @@ -68,7 +67,6 @@ CONFIG_HEADER = $(top_builddir)/include/config.h libgcj-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = -DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -94,7 +92,6 @@ am__installdirs = "$(DESTDIR)$(gcjdir)" "$(DESTDIR)$(toolgcjdir)" HEADERS = $(gcj_HEADERS) $(toolgcj_HEADERS) ETAGS = etags CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ ANTLR_JAR = @ANTLR_JAR@ @@ -136,6 +133,7 @@ EGREP = @EGREP@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCC_FOR_ECJX = @GCC_FOR_ECJX@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ @@ -497,37 +495,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done check-am: all-am check: check-am all-am: Makefile $(HEADERS) libgcj-config.h @@ -630,14 +597,13 @@ uninstall-am: uninstall-gcjHEADERS uninstall-toolgcjHEADERS .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-gcjHEADERS install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-toolgcjHEADERS installcheck \ - installcheck-am installdirs maintainer-clean \ + distclean-libtool distclean-tags dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-gcjHEADERS install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip install-toolgcjHEADERS \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-gcjHEADERS uninstall-toolgcjHEADERS diff --git a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc index 0d8d0e8341b..fabdbcbe526 100644 --- a/libjava/gnu/gcj/runtime/natSharedLibLoader.cc +++ b/libjava/gnu/gcj/runtime/natSharedLibLoader.cc @@ -119,11 +119,14 @@ gnu::gcj::runtime::SharedLibHelper::hasResource (jstring name) #endif } +#ifdef HAVE_DLOPEN +extern gnu::gcj::Core *_Jv_create_core (_Jv_core_chain *node, jstring name); +#endif + gnu::gcj::Core * gnu::gcj::runtime::SharedLibHelper::findCore (jstring name) { #ifdef HAVE_DLOPEN - extern gnu::gcj::Core *_Jv_create_core (_Jv_core_chain *node, jstring name); ensureInit(); return _Jv_create_core ((_Jv_core_chain *) core_chain, name); #else diff --git a/libjava/gnu/java/security/jce/prng/natVMSecureRandomWin32.cc b/libjava/gnu/java/security/jce/prng/natVMSecureRandomWin32.cc index 1a9d0d355e2..4c7c1f52089 100755 --- a/libjava/gnu/java/security/jce/prng/natVMSecureRandomWin32.cc +++ b/libjava/gnu/java/security/jce/prng/natVMSecureRandomWin32.cc @@ -1,6 +1,6 @@ // natVMSecureRandomWin32.cc - Native part of VMSecureRandom class for Win32. -/* Copyright (C) 2009 Free Software Foundation +/* Copyright (C) 2009, 2010 Free Software Foundation This file is part of libgcj. @@ -26,7 +26,7 @@ jint gnu::java::security::jce::prng::VMSecureRandom::natGenerateSeed(jbyteArray byte_array, jint offset, jint length) { if (length != 0) - throw new java::lang::UnsupportedOperationException ( + throw new ::java::lang::UnsupportedOperationException ( JvNewStringLatin1 ("natGenerateSeed is not available for Win32 target.")); return 0; } diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 2e04d8d9028..5df713e1fc4 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -36,7 +36,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = include -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/config.h.in $(tool_include__HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \ @@ -68,7 +68,6 @@ CONFIG_CLEAN_FILES = platform.h java-gc.h java-threads.h java-signal.h \ java-signal-aux.h CONFIG_CLEAN_VPATH_FILES = SOURCES = -DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -94,7 +93,6 @@ am__installdirs = "$(DESTDIR)$(tool_include_dir)" HEADERS = $(tool_include__HEADERS) ETAGS = etags CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ ANTLR_JAR = @ANTLR_JAR@ @@ -136,6 +134,7 @@ EGREP = @EGREP@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCC_FOR_ECJX = @GCC_FOR_ECJX@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ @@ -476,37 +475,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done check-am: all-am check: check-am all-am: Makefile $(HEADERS) config.h @@ -609,17 +577,16 @@ uninstall-am: uninstall-tool_include_HEADERS .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool ctags distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip \ - install-tool_include_HEADERS installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags uninstall uninstall-am \ - uninstall-tool_include_HEADERS + distclean-libtool distclean-tags dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip install-tool_include_HEADERS \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-tool_include_HEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/libjava/include/java-assert.h b/libjava/include/java-assert.h index 57962418b7d..1d3a49bfa38 100644 --- a/libjava/include/java-assert.h +++ b/libjava/include/java-assert.h @@ -1,6 +1,6 @@ // java-assert.h - Header file holding assertion definitions. -*- c++ -*- -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2010 Free Software Foundation This file is part of libgcj. @@ -29,8 +29,8 @@ void _Jv_Abort (const char *, const char *, int, const char *) #else /* __GCJ_DEBUG */ #define _Jv_AssertDoCall(Message) -#define JvAssertMessage(Expr, Message) -#define JvAssert(Expr) +#define JvAssertMessage(Expr, Message) (void) sizeof (Expr) +#define JvAssert(Expr) (void) sizeof (Expr) #define JvFail(Message) _Jv_Abort (0, 0, 0, Message) #endif /* not __GCJ_DEBUG */ diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 61b2a6aa3d9..b2cf3cffb0d 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -56,9 +56,9 @@ details. */ #define _Jv_platform_solib_suffix ".so" #endif -#if defined(__APPLE__) && defined(__MACH__) -#undef _Unwind_FindEnclosingFunction -#define _Unwind_FindEnclosingFunction(PC) _darwin10_Unwind_FindEnclosingFunction(PC) +#if __MACH__ && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060) +# undef _Unwind_FindEnclosingFunction +# define _Unwind_FindEnclosingFunction(PC) _darwin10_Unwind_FindEnclosingFunction(PC) #endif // Some POSIX systems don't have O_SYNC and O_DYSNC so we define them here. diff --git a/libjava/include/s390-signal.h b/libjava/include/s390-signal.h index fe965bd2b46..4b0a61eee0a 100644 --- a/libjava/include/s390-signal.h +++ b/libjava/include/s390-signal.h @@ -39,6 +39,7 @@ static void _name (int, siginfo_t *_si __attribute__((unused)), \ and if dividend and divisor are as above, we simply return from the signal handler. This causes execution to continue after the instruction. Before returning, we the set result registers as expected. */ +#define UC_EXTENDED 0x00000001 #define HANDLE_DIVIDE_OVERFLOW \ do \ @@ -47,6 +48,15 @@ do \ __builtin_extract_return_addr (_si->si_addr); \ unsigned long *_regs = _uc->uc_mcontext.gregs; \ int _r1, _r2, _d2, _x2, _b2; \ + struct \ + { \ + unsigned long int uc_flags; \ + struct ucontext *uc_link; \ + stack_t uc_stack; \ + mcontext_t uc_mcontext; \ + unsigned long sigmask[2]; \ + unsigned long ext_regs[16]; \ + } *_uc_ext = (typeof(_uc_ext))_uc; \ \ /* First, a couple of helper routines to decode instructions. */ \ struct _decode \ @@ -119,8 +129,16 @@ do \ { \ return _d + (_x? _regs[_x] : 0) + (_b? _regs[_b] : 0); \ } \ - }; \ \ + static inline int is_long_long_min_p (unsigned long *_regs, \ + unsigned long *_ext_regs, \ + int _r) \ + { \ + return ((long long)_regs[_r] \ + | (long long)_ext_regs[_r] << 32) == \ + LONG_LONG_MIN; \ + } \ + }; \ \ /* DR r1,r2 */ \ if (_decode::_is_rr (_eip, 0x1d, &_r1, &_r2) \ @@ -175,8 +193,58 @@ do \ _regs[_r1] = 0; \ return; \ } \ - \ -} \ + \ + /* The extended ucontext contains the upper halfs of the 64bit \ + registers in 31bit applications. */ \ + if (_uc->uc_flags & 1 == 1) \ + { \ + /* DSGR r1,r2 */ \ + if (_decode::_is_rre (_eip, 0xb9, 0x0d, &_r1, &_r2) \ + && (int) _regs[_r2] == -1 \ + && (int) _uc_ext->ext_regs[_r2] == -1 \ + && _decode::is_long_long_min_p (_regs, _uc_ext->ext_regs, \ + _r1 + 1)) \ + { \ + _regs[_r1] = 0; \ + _uc_ext->ext_regs[_r1] = 0; \ + return; \ + } \ + \ + /* DSGFR r1,r2 */ \ + if (_decode::_is_rre (_eip, 0xb9, 0x1d, &_r1, &_r2) \ + && (int) _regs[_r2] == -1 \ + && _decode::is_long_long_min_p (_regs, _uc_ext->ext_regs, \ + _r1 + 1)) \ + { \ + _regs[_r1] = 0; \ + _uc_ext->ext_regs[_r1] = 0; \ + return; \ + } \ + \ + /* DSG r1,d2(x2,b2) */ \ + if (_decode::_is_rxy (_eip, 0xe3, 0x0d, &_r1, &_d2, &_x2, &_b2) \ + && *(int *) _decode::_eff (_regs, _d2, _x2, _b2) == -1 \ + && *(int *) _decode::_eff (_regs, _d2 + 4, _x2, _b2) == -1 \ + && _decode::is_long_long_min_p (_regs, _uc_ext->ext_regs, \ + _r1 + 1)) \ + { \ + _regs[_r1] = 0; \ + _uc_ext->ext_regs[_r1] = 0; \ + return; \ + } \ + \ + /* DSGF r1,d2(x2,b2) */ \ + if (_decode::_is_rxy (_eip, 0xe3, 0x1d, &_r1, &_d2, &_x2, &_b2) \ + && *(int *) _decode::_eff (_regs, _d2, _x2, _b2) == -1 \ + && _decode::is_long_long_min_p (_regs, _uc_ext->ext_regs, \ + _r1 + 1)) \ + { \ + _regs[_r1] = 0; \ + _uc_ext->ext_regs[_r1] = 0; \ + return; \ + } \ + } \ + } \ while (0) /* For an explanation why we cannot simply use sigaction to diff --git a/libjava/include/sparc-signal.h b/libjava/include/solaris-signal.h index a936afe067f..a936afe067f 100644 --- a/libjava/include/sparc-signal.h +++ b/libjava/include/solaris-signal.h diff --git a/libjava/libgcj.ver b/libjava/libgcj.ver index d2d189b5249..4e90d9d1f8e 100644 --- a/libjava/libgcj.ver +++ b/libjava/libgcj.ver @@ -2,6 +2,12 @@ # symbols in libgcj.so. { - global: Jv*; _Jv_*; __gcj_personality_v0; __gcj_personality_sj0; _Z*; - local: *; + global: + Jv*; + _Jv_*; + __gcj_personality_v0; + __gcj_personality_sj0; + _Z*; + local: + *; }; diff --git a/libjava/libltdl/ChangeLog b/libjava/libltdl/ChangeLog index 2214d7becde..7cc5e5494fa 100644 --- a/libjava/libltdl/ChangeLog +++ b/libjava/libltdl/ChangeLog @@ -1,3 +1,9 @@ +2010-05-04 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR other/43620 + * Makefile.am (AUTOMAKE_OPTIONS): Add no-dist. + * Makefile.in: Regenerate. + 2010-04-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in: Regenerate. diff --git a/libjava/libltdl/Makefile.am b/libjava/libltdl/Makefile.am index 737290e6c7c..0c2e26386be 100644 --- a/libjava/libltdl/Makefile.am +++ b/libjava/libltdl/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = no-dependencies foreign +AUTOMAKE_OPTIONS = no-dependencies foreign no-dist ACLOCAL_AMFLAGS = -I ../.. -I ../../config diff --git a/libjava/libltdl/Makefile.in b/libjava/libltdl/Makefile.in index 5f6f36b8dd5..f77e9be6cfe 100644 --- a/libjava/libltdl/Makefile.in +++ b/libjava/libltdl/Makefile.in @@ -36,11 +36,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \ - $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config-h.in \ - $(top_srcdir)/configure COPYING.LIB ChangeLog config.guess \ - config.sub install-sh ltmain.sh missing +DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(srcdir)/config-h.in ltmain.sh \ + config.guess config.sub $(am__include_HEADERS_DIST) \ + $(am__noinst_HEADERS_DIST) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \ @@ -103,7 +103,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) -DIST_SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES) MULTISRCTOP = MULTIBUILDTOP = MULTIDIRS = @@ -115,17 +114,6 @@ am__noinst_HEADERS_DIST = ltdl.h HEADERS = $(include_HEADERS) $(noinst_HEADERS) ETAGS = etags CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AR = @AR@ @@ -232,7 +220,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = no-dependencies foreign +AUTOMAKE_OPTIONS = no-dependencies foreign no-dist ACLOCAL_AMFLAGS = -I ../.. -I ../../config INCLUDES = $(GCINCS) @INSTALL_LTDL_TRUE@include_HEADERS = ltdl.h @@ -465,154 +453,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r "$(distdir)" -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - -dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - test -d $(distdir)/_build || exit 0; \ - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ - && cd "$$am__cwd" \ - || exit 1 - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' -distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS) config.h @@ -725,15 +565,12 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES .PHONY: CTAGS GTAGS all all-am all-multi am--refresh check check-am \ clean clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-multi clean-noinstLTLIBRARIES ctags dist dist-all \ - dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-multi distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am \ + clean-multi clean-noinstLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-multi distclean-tags dvi dvi-am \ + html html-am info info-am install install-am install-data \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-includeHEADERS install-info install-info-am \ install-libLTLIBRARIES install-man install-multi install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ diff --git a/libjava/libtool-version b/libjava/libtool-version index 7af63f67bad..834eb964fd8 100644 --- a/libjava/libtool-version +++ b/libjava/libtool-version @@ -3,4 +3,4 @@ # a separate file so that version updates don't involve re-running # automake. # CURRENT:REVISION:AGE -11:0:0 +12:0:0 diff --git a/libjava/testsuite/Makefile.am b/libjava/testsuite/Makefile.am index fe42040d364..2aebd7c9938 100644 --- a/libjava/testsuite/Makefile.am +++ b/libjava/testsuite/Makefile.am @@ -24,6 +24,31 @@ MYGCJH = gjavah .PHONY: compile-tests +# We need more things in site.exp, but automake completely controls the +# creation of that file; there's no way to append to it without messing up +# the dependency chains. So we overrule automake. This rule is exactly +# what it would have generated, plus our own additions. +site.exp: Makefile + @echo 'Making a new site.exp file...' + @echo '## these variables are automatically generated by make ##' >site.tmp + @echo '# Do not edit here. If you wish to override these values' >>site.tmp + @echo '# edit the last section' >>site.tmp + @echo 'set srcdir $(srcdir)' >>site.tmp + @echo "set objdir `pwd`" >>site.tmp + @echo 'set build_alias "$(build_alias)"' >>site.tmp + @echo 'set build_triplet $(build_triplet)' >>site.tmp + @echo 'set host_alias "$(host_alias)"' >>site.tmp + @echo 'set host_triplet $(host_triplet)' >>site.tmp + @echo 'set target_alias "$(target_alias)"' >>site.tmp + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo 'set libiconv "$(LIBICONV)"' >>site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp + @-rm -f site.bak + @test ! -f site.exp || mv site.exp site.bak + @mv site.tmp site.exp + check-am: compile-tests compile-tests: diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index fc1db70566d..37f81c21005 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -35,7 +35,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = testsuite -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \ $(top_srcdir)/../config/acx.m4 \ @@ -66,10 +66,8 @@ CONFIG_HEADER = $(top_builddir)/include/config.h \ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = SOURCES = -DIST_SOURCES = DEJATOOL = $(PACKAGE) RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ ANTLR_JAR = @ANTLR_JAR@ @@ -111,6 +109,7 @@ EGREP = @EGREP@ EXCEPTIONSPEC = @EXCEPTIONSPEC@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCC_FOR_ECJX = @GCC_FOR_ECJX@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ @@ -388,62 +387,12 @@ check-DEJAGNU: site.exp else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi; \ exit $$exit_status -site.exp: Makefile - @echo 'Making a new site.exp file...' - @echo '## these variables are automatically generated by make ##' >site.tmp - @echo '# Do not edit here. If you wish to override these values' >>site.tmp - @echo '# edit the last section' >>site.tmp - @echo 'set srcdir $(srcdir)' >>site.tmp - @echo "set objdir `pwd`" >>site.tmp - @echo 'set build_alias "$(build_alias)"' >>site.tmp - @echo 'set build_triplet $(build_triplet)' >>site.tmp - @echo 'set host_alias "$(host_alias)"' >>site.tmp - @echo 'set host_triplet $(host_triplet)' >>site.tmp - @echo 'set target_alias "$(target_alias)"' >>site.tmp - @echo 'set target_triplet $(target_triplet)' >>site.tmp - @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp - @test ! -f site.exp || \ - sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp - @-rm -f site.bak - @test ! -f site.exp || mv site.exp site.bak - @mv site.tmp site.exp distclean-DEJAGNU: -rm -f site.exp site.bak -l='$(DEJATOOL)'; for tool in $$l; do \ rm -f $$tool.sum $$tool.log; \ done - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check: check-am @@ -544,8 +493,8 @@ uninstall-am: .PHONY: all all-am check check-DEJAGNU check-am clean clean-generic \ clean-libtool distclean distclean-DEJAGNU distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ + distclean-libtool dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ @@ -557,6 +506,31 @@ uninstall-am: .PHONY: compile-tests +# We need more things in site.exp, but automake completely controls the +# creation of that file; there's no way to append to it without messing up +# the dependency chains. So we overrule automake. This rule is exactly +# what it would have generated, plus our own additions. +site.exp: Makefile + @echo 'Making a new site.exp file...' + @echo '## these variables are automatically generated by make ##' >site.tmp + @echo '# Do not edit here. If you wish to override these values' >>site.tmp + @echo '# edit the last section' >>site.tmp + @echo 'set srcdir $(srcdir)' >>site.tmp + @echo "set objdir `pwd`" >>site.tmp + @echo 'set build_alias "$(build_alias)"' >>site.tmp + @echo 'set build_triplet $(build_triplet)' >>site.tmp + @echo 'set host_alias "$(host_alias)"' >>site.tmp + @echo 'set host_triplet $(host_triplet)' >>site.tmp + @echo 'set target_alias "$(target_alias)"' >>site.tmp + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo 'set libiconv "$(LIBICONV)"' >>site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp + @-rm -f site.bak + @test ! -f site.exp || mv site.exp site.bak + @mv site.tmp site.exp + check-am: compile-tests compile-tests: diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 68dbd279033..dbeced481a8 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -251,7 +251,11 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} { } proc gcj_jni_get_cxxflags_invocation {} { + global libiconv global LIBJAVA + if {$libiconv == ""} { + set libiconv "-liconv" + } if [info exists LIBJAVA] { set libjava $LIBJAVA; } else { @@ -267,7 +271,7 @@ proc gcj_jni_get_cxxflags_invocation {} { # to just make the linker find libgcc using -L options. # Similar logic applies to libgcj. if { [istarget "*-*-darwin*"] } { - lappend cxxflags -shared-libgcc -lgcj -liconv + eval lappend cxxflags "-shared-libgcc -lgcj $libiconv" } if { [istarget "*-*-solaris*"] } { |