diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index f5d7e2e5fc1..9f05a757d69 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,10 @@ +2009-09-11 Ralf Wildenhues + + * Makefile.am (libgcjgc_la_LINK, gctest_LINK): New. + (gctest_LDADD): Depend on libgcjgc.la instead of ./libgcjgc.la, + so that library dependency resolution works with portable make. + * Makefile.in: Regenerate. + 2009-09-08 Alexandre Oliva * configure: Rebuilt with modified libtool.m4. diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index 843891110c0..b074ac6df48 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -40,6 +40,7 @@ extra_ldflags_libgc = @extra_ldflags_libgc@ libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS) libgcjgc_la_DEPENDENCIES = @addobjs@ libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir) +libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS) libgcjgc_convenience_la_LIBADD = @addobjs@ libgcjgc_convenience_la_DEPENDENCIES = @addobjs@ @@ -49,8 +50,9 @@ AM_CFLAGS = @GC_CFLAGS@ check_PROGRAMS = gctest gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) gctest_LDFLAGS = -shared-libgcc +gctest_LINK = $(LINK) $(gctest_LDFLAGS) TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc TESTS = gctest diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index 70110d3e194..5b1cfe748a4 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -70,9 +70,6 @@ am_libgcjgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \ backgraph.lo win32_threads.lo pthread_support.lo \ pthread_stop_world.lo darwin_stop_world.lo $(am__objects_1) libgcjgc_la_OBJECTS = $(am_libgcjgc_la_OBJECTS) -libgcjgc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libgcjgc_la_LDFLAGS) $(LDFLAGS) -o $@ am__objects_2 = allchblk.lo alloc.lo blacklst.lo checksums.lo \ dbg_mlc.lo dyn_load.lo finalize.lo gc_dlopen.lo gcj_mlc.lo \ headers.lo malloc.lo mallocx.lo mark.lo mark_rts.lo misc.lo \ @@ -86,11 +83,8 @@ libgcjgc_convenience_la_OBJECTS = \ am__dirstamp = $(am__leading_dot)dirstamp am_gctest_OBJECTS = tests/test.$(OBJEXT) gctest_OBJECTS = $(am_gctest_OBJECTS) -gctest_DEPENDENCIES = ./libgcjgc.la $(am__DEPENDENCIES_1) \ +gctest_DEPENDENCIES = libgcjgc.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -gctest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gctest_LDFLAGS) \ - $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include depcomp = am__depfiles_maybe = @@ -291,13 +285,15 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS) libgcjgc_la_DEPENDENCIES = @addobjs@ libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir) +libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS) libgcjgc_convenience_la_LIBADD = @addobjs@ libgcjgc_convenience_la_DEPENDENCIES = @addobjs@ AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) gctest_LDFLAGS = -shared-libgcc +gctest_LINK = $(LINK) $(gctest_LDFLAGS) TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc LTCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \ $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \ diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index f46f11a861e..8cc223e4b78 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,8 @@ +2009-09-11 Ralf Wildenhues + + * Makefile.am (libgfortranbegin_la_LINK): New. + * Makefile.in: Regenerate. + 2009-09-09 Paolo Bonzini * configure: Regenerate. diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index 08609557ce6..c2fd941a992 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -24,6 +24,7 @@ myexeclib_LTLIBRARIES = libgfortranbegin.la myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) libgfortranbegin_la_SOURCES = fmain.c libgfortranbegin_la_LDFLAGS = -static +libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS) ## io.h conflicts with a system header on some platforms, so ## use -iquote diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index 1bcae42d52d..462b07b487b 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -777,9 +777,6 @@ libgfortran_la_OBJECTS = $(am_libgfortran_la_OBJECTS) libgfortranbegin_la_LIBADD = am_libgfortranbegin_la_OBJECTS = fmain.lo libgfortranbegin_la_OBJECTS = $(am_libgfortranbegin_la_OBJECTS) -libgfortranbegin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libgfortranbegin_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../depcomp am__depfiles_maybe = depfiles @@ -984,6 +981,7 @@ myexeclib_LTLIBRARIES = libgfortranbegin.la myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) libgfortranbegin_la_SOURCES = fmain.c libgfortranbegin_la_LDFLAGS = -static +libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS) AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \ -I$(srcdir)/$(MULTISRCTOP)../gcc/config \ -I$(MULTIBUILDTOP)../../$(host_subdir)/gcc -D_GNU_SOURCE diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index e88bdee68ad..d94cb78d24c 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2009-09-11 Ralf Wildenhues + + * Makefile.am (libgomp_la_LINK): New. + * Makefile.in: Regenerate. + 2009-08-24 Ralf Wildenhues * configure.ac (AC_PREREQ): Bump to 2.64. diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am index 5bc0732c01f..3786bee4c13 100644 --- a/libgomp/Makefile.am +++ b/libgomp/Makefile.am @@ -29,6 +29,7 @@ endif libgomp_version_info = -version-info $(libtool_VERSION) libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script) \ -no-undefined -bindir "$(bindir)" +libgomp_la_LINK = $(LINK) $(libgomp_la_LDFLAGS) libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \ iter_ull.c loop.c loop_ull.c ordered.c parallel.c sections.c single.c \ diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index d5b9c474904..20c6975833e 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -100,9 +100,6 @@ am_libgomp_la_OBJECTS = alloc.lo barrier.lo critical.lo env.lo \ lock.lo mutex.lo proc.lo sem.lo bar.lo ptrlock.lo time.lo \ fortran.lo affinity.lo libgomp_la_OBJECTS = $(am_libgomp_la_OBJECTS) -libgomp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libgomp_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/../depcomp am__depfiles_maybe = depfiles @@ -347,6 +344,7 @@ libgomp_version_info = -version-info $(libtool_VERSION) libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script) \ -no-undefined -bindir "$(bindir)" +libgomp_la_LINK = $(LINK) $(libgomp_la_LDFLAGS) libgomp_la_SOURCES = alloc.c barrier.c critical.c env.c error.c iter.c \ iter_ull.c loop.c loop_ull.c ordered.c parallel.c sections.c single.c \ task.c team.c work.c lock.c mutex.c proc.c sem.c bar.c ptrlock.c \ diff --git a/libjava/ChangeLog b/libjava/ChangeLog index be89f186885..829023209cb 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2009-09-11 Ralf Wildenhues + + * Makefile.am (libgij_la_LINK, libjvm_la_LINK): New. + * Makefile.in: Regenerate. + 2009-09-08 Alexandre Oliva * configure: Rebuilt with modified libtool.m4. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 13b25ac7ea6..7b6750c493c 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -223,6 +223,7 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la ## The mysterious backslash in the grep pattern is consumed by make. libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) +libgij_la_LINK = $(CXXLINK) $(libgij_la_LDFLAGS) if INTERPRETER libgcj_interpret_source_files = jvmti.cc interpret.cc @@ -326,6 +327,7 @@ libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec ## See jv_convert_LDADD. libjvm_la_LIBADD = -L$(here)/.libs libgcj.la libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC) +libjvm_la_LINK = $(CXXLINK) $(libjvm_la_LDFLAGS) ## The .db file. This rule is only used for native builds, so it is ## safe to invoke gcj-dbtool. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 9608e7941df..349b9074d34 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -454,14 +454,8 @@ libgcj_bc_la_OBJECTS = $(am_libgcj_bc_la_OBJECTS) @USE_LIBGCJ_BC_TRUE@am_libgcj_bc_la_rpath = -rpath $(toolexeclibdir) am_libgij_la_OBJECTS = gij.lo libgij_la_OBJECTS = $(am_libgij_la_OBJECTS) -libgij_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libgij_la_LDFLAGS) $(LDFLAGS) -o $@ am_libjvm_la_OBJECTS = jni-libjvm.lo libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS) -libjvm_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libjvm_la_LDFLAGS) $(LDFLAGS) -o $@ @CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__EXEEXT_1 = gjdoc$(EXEEXT) @NATIVE_TRUE@am__EXEEXT_2 = jv-convert$(EXEEXT) gij$(EXEEXT) \ @NATIVE_TRUE@ grmic$(EXEEXT) grmiregistry$(EXEEXT) \ @@ -973,6 +967,7 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) +libgij_la_LINK = $(CXXLINK) $(libgij_la_LDFLAGS) @INTERPRETER_FALSE@libgcj_interpret_source_files = @INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \ @@ -1027,6 +1022,7 @@ libjvm_la_SOURCES = jni-libjvm.cc libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec libjvm_la_LIBADD = -L$(here)/.libs libgcj.la libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC) +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 \ diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7f646a97526..0fc0a4f284a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2009-09-11 Ralf Wildenhues + + * src/Makefile.am (libstdc___la_LINK): New. + * src/Makefile.in: Regenerate. + 2009-09-09 Loren J. Rittle * testsuite/30_threads/thread/native_handle/typesizes.cc: Remove diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 54d521825c4..9513bd52dbf 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -209,6 +209,8 @@ libstdc___la_DEPENDENCIES = \ libstdc___la_LDFLAGS = \ -version-info $(libtool_VERSION) ${version_arg} -lm +libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) + # Use special rules for the deprecated source files so that they find # deprecated include files. GLIBCXX_INCLUDE_DIR=$(glibcxx_builddir)/include diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index e484d86e130..9c03ac4dc78 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -129,9 +129,6 @@ am__objects_5 = atomic.lo bitmap_allocator.lo pool_allocator.lo \ thread.lo future.lo $(am__objects_1) $(am__objects_4) am_libstdc___la_OBJECTS = $(am__objects_5) libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS) -libstdc___la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libstdc___la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = am__depfiles_maybe = @@ -450,6 +447,7 @@ libstdc___la_DEPENDENCIES = \ libstdc___la_LDFLAGS = \ -version-info $(libtool_VERSION) ${version_arg} -lm +libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS) # Use special rules for the deprecated source files so that they find # deprecated include files.