Override all per-target *_LINK variables correctly.
boehm-gc/: * 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. libgfortran/: * Makefile.am (libgfortranbegin_la_LINK): New. * Makefile.in: Regenerate. libgomp/: * Makefile.am (libgomp_la_LINK): New. * Makefile.in: Regenerate. libjava/: * Makefile.am (libgij_la_LINK, libjvm_la_LINK): New. * Makefile.in: Regenerate. libstdc++-v3/: * src/Makefile.am (libstdc___la_LINK): New. * src/Makefile.in: Regenerate. From-SVN: r151627
This commit is contained in:
parent
b851135c6c
commit
878f62e5bd
|
@ -1,3 +1,10 @@
|
||||||
|
2009-09-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
|
* 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 <aoliva@redhat.com>
|
2009-09-08 Alexandre Oliva <aoliva@redhat.com>
|
||||||
|
|
||||||
* configure: Rebuilt with modified libtool.m4.
|
* configure: Rebuilt with modified libtool.m4.
|
||||||
|
|
|
@ -40,6 +40,7 @@ extra_ldflags_libgc = @extra_ldflags_libgc@
|
||||||
libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS)
|
libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS)
|
||||||
libgcjgc_la_DEPENDENCIES = @addobjs@
|
libgcjgc_la_DEPENDENCIES = @addobjs@
|
||||||
libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir)
|
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_LIBADD = @addobjs@
|
||||||
libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
|
libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
|
||||||
|
@ -49,8 +50,9 @@ AM_CFLAGS = @GC_CFLAGS@
|
||||||
|
|
||||||
check_PROGRAMS = gctest
|
check_PROGRAMS = gctest
|
||||||
gctest_SOURCES = tests/test.c
|
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_LDFLAGS = -shared-libgcc
|
||||||
|
gctest_LINK = $(LINK) $(gctest_LDFLAGS)
|
||||||
TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
|
TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
|
||||||
TESTS = gctest
|
TESTS = gctest
|
||||||
|
|
||||||
|
|
|
@ -70,9 +70,6 @@ am_libgcjgc_la_OBJECTS = allchblk.lo alloc.lo blacklst.lo checksums.lo \
|
||||||
backgraph.lo win32_threads.lo pthread_support.lo \
|
backgraph.lo win32_threads.lo pthread_support.lo \
|
||||||
pthread_stop_world.lo darwin_stop_world.lo $(am__objects_1)
|
pthread_stop_world.lo darwin_stop_world.lo $(am__objects_1)
|
||||||
libgcjgc_la_OBJECTS = $(am_libgcjgc_la_OBJECTS)
|
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 \
|
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 \
|
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 \
|
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__dirstamp = $(am__leading_dot)dirstamp
|
||||||
am_gctest_OBJECTS = tests/test.$(OBJEXT)
|
am_gctest_OBJECTS = tests/test.$(OBJEXT)
|
||||||
gctest_OBJECTS = $(am_gctest_OBJECTS)
|
gctest_OBJECTS = $(am_gctest_OBJECTS)
|
||||||
gctest_DEPENDENCIES = ./libgcjgc.la $(am__DEPENDENCIES_1) \
|
gctest_DEPENDENCIES = libgcjgc.la $(am__DEPENDENCIES_1) \
|
||||||
$(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
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
|
||||||
depcomp =
|
depcomp =
|
||||||
am__depfiles_maybe =
|
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_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS)
|
||||||
libgcjgc_la_DEPENDENCIES = @addobjs@
|
libgcjgc_la_DEPENDENCIES = @addobjs@
|
||||||
libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir)
|
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_LIBADD = @addobjs@
|
||||||
libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
|
libgcjgc_convenience_la_DEPENDENCIES = @addobjs@
|
||||||
AM_CXXFLAGS = @GC_CFLAGS@
|
AM_CXXFLAGS = @GC_CFLAGS@
|
||||||
AM_CFLAGS = @GC_CFLAGS@
|
AM_CFLAGS = @GC_CFLAGS@
|
||||||
gctest_SOURCES = tests/test.c
|
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_LDFLAGS = -shared-libgcc
|
||||||
|
gctest_LINK = $(LINK) $(gctest_LDFLAGS)
|
||||||
TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
|
TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
|
||||||
LTCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
|
LTCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
|
||||||
$(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
$(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
2009-09-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
|
* Makefile.am (libgfortranbegin_la_LINK): New.
|
||||||
|
* Makefile.in: Regenerate.
|
||||||
|
|
||||||
2009-09-09 Paolo Bonzini <bonzini@gnu.org>
|
2009-09-09 Paolo Bonzini <bonzini@gnu.org>
|
||||||
|
|
||||||
* configure: Regenerate.
|
* configure: Regenerate.
|
||||||
|
|
|
@ -24,6 +24,7 @@ myexeclib_LTLIBRARIES = libgfortranbegin.la
|
||||||
myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
|
myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
|
||||||
libgfortranbegin_la_SOURCES = fmain.c
|
libgfortranbegin_la_SOURCES = fmain.c
|
||||||
libgfortranbegin_la_LDFLAGS = -static
|
libgfortranbegin_la_LDFLAGS = -static
|
||||||
|
libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS)
|
||||||
|
|
||||||
## io.h conflicts with a system header on some platforms, so
|
## io.h conflicts with a system header on some platforms, so
|
||||||
## use -iquote
|
## use -iquote
|
||||||
|
|
|
@ -777,9 +777,6 @@ libgfortran_la_OBJECTS = $(am_libgfortran_la_OBJECTS)
|
||||||
libgfortranbegin_la_LIBADD =
|
libgfortranbegin_la_LIBADD =
|
||||||
am_libgfortranbegin_la_OBJECTS = fmain.lo
|
am_libgfortranbegin_la_OBJECTS = fmain.lo
|
||||||
libgfortranbegin_la_OBJECTS = $(am_libgfortranbegin_la_OBJECTS)
|
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@
|
DEFAULT_INCLUDES = -I.@am__isrc@
|
||||||
depcomp = $(SHELL) $(top_srcdir)/../depcomp
|
depcomp = $(SHELL) $(top_srcdir)/../depcomp
|
||||||
am__depfiles_maybe = depfiles
|
am__depfiles_maybe = depfiles
|
||||||
|
@ -984,6 +981,7 @@ myexeclib_LTLIBRARIES = libgfortranbegin.la
|
||||||
myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
|
myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
|
||||||
libgfortranbegin_la_SOURCES = fmain.c
|
libgfortranbegin_la_SOURCES = fmain.c
|
||||||
libgfortranbegin_la_LDFLAGS = -static
|
libgfortranbegin_la_LDFLAGS = -static
|
||||||
|
libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS)
|
||||||
AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \
|
AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \
|
||||||
-I$(srcdir)/$(MULTISRCTOP)../gcc/config \
|
-I$(srcdir)/$(MULTISRCTOP)../gcc/config \
|
||||||
-I$(MULTIBUILDTOP)../../$(host_subdir)/gcc -D_GNU_SOURCE
|
-I$(MULTIBUILDTOP)../../$(host_subdir)/gcc -D_GNU_SOURCE
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
2009-09-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
|
* Makefile.am (libgomp_la_LINK): New.
|
||||||
|
* Makefile.in: Regenerate.
|
||||||
|
|
||||||
2009-08-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
2009-08-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
* configure.ac (AC_PREREQ): Bump to 2.64.
|
* configure.ac (AC_PREREQ): Bump to 2.64.
|
||||||
|
|
|
@ -29,6 +29,7 @@ endif
|
||||||
libgomp_version_info = -version-info $(libtool_VERSION)
|
libgomp_version_info = -version-info $(libtool_VERSION)
|
||||||
libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script) \
|
libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script) \
|
||||||
-no-undefined -bindir "$(bindir)"
|
-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 \
|
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 \
|
iter_ull.c loop.c loop_ull.c ordered.c parallel.c sections.c single.c \
|
||||||
|
|
|
@ -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 \
|
lock.lo mutex.lo proc.lo sem.lo bar.lo ptrlock.lo time.lo \
|
||||||
fortran.lo affinity.lo
|
fortran.lo affinity.lo
|
||||||
libgomp_la_OBJECTS = $(am_libgomp_la_OBJECTS)
|
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@
|
DEFAULT_INCLUDES = -I.@am__isrc@
|
||||||
depcomp = $(SHELL) $(top_srcdir)/../depcomp
|
depcomp = $(SHELL) $(top_srcdir)/../depcomp
|
||||||
am__depfiles_maybe = depfiles
|
am__depfiles_maybe = depfiles
|
||||||
|
@ -347,6 +344,7 @@ libgomp_version_info = -version-info $(libtool_VERSION)
|
||||||
libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script) \
|
libgomp_la_LDFLAGS = $(libgomp_version_info) $(libgomp_version_script) \
|
||||||
-no-undefined -bindir "$(bindir)"
|
-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 \
|
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 \
|
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 \
|
task.c team.c work.c lock.c mutex.c proc.c sem.c bar.c ptrlock.c \
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
2009-09-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
|
* Makefile.am (libgij_la_LINK, libjvm_la_LINK): New.
|
||||||
|
* Makefile.in: Regenerate.
|
||||||
|
|
||||||
2009-09-08 Alexandre Oliva <aoliva@redhat.com>
|
2009-09-08 Alexandre Oliva <aoliva@redhat.com>
|
||||||
|
|
||||||
* configure: Rebuilt with modified libtool.m4.
|
* configure: Rebuilt with modified libtool.m4.
|
||||||
|
|
|
@ -223,6 +223,7 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la
|
||||||
## The mysterious backslash in the grep pattern is consumed by make.
|
## The mysterious backslash in the grep pattern is consumed by make.
|
||||||
libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
|
libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
|
||||||
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
|
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
|
||||||
|
libgij_la_LINK = $(CXXLINK) $(libgij_la_LDFLAGS)
|
||||||
|
|
||||||
if INTERPRETER
|
if INTERPRETER
|
||||||
libgcj_interpret_source_files = jvmti.cc interpret.cc
|
libgcj_interpret_source_files = jvmti.cc interpret.cc
|
||||||
|
@ -326,6 +327,7 @@ libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
|
||||||
## See jv_convert_LDADD.
|
## See jv_convert_LDADD.
|
||||||
libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
|
libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
|
||||||
libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
|
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
|
## The .db file. This rule is only used for native builds, so it is
|
||||||
## safe to invoke gcj-dbtool.
|
## safe to invoke gcj-dbtool.
|
||||||
|
|
|
@ -454,14 +454,8 @@ libgcj_bc_la_OBJECTS = $(am_libgcj_bc_la_OBJECTS)
|
||||||
@USE_LIBGCJ_BC_TRUE@am_libgcj_bc_la_rpath = -rpath $(toolexeclibdir)
|
@USE_LIBGCJ_BC_TRUE@am_libgcj_bc_la_rpath = -rpath $(toolexeclibdir)
|
||||||
am_libgij_la_OBJECTS = gij.lo
|
am_libgij_la_OBJECTS = gij.lo
|
||||||
libgij_la_OBJECTS = $(am_libgij_la_OBJECTS)
|
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
|
am_libjvm_la_OBJECTS = jni-libjvm.lo
|
||||||
libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS)
|
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)
|
@CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__EXEEXT_1 = gjdoc$(EXEEXT)
|
||||||
@NATIVE_TRUE@am__EXEEXT_2 = jv-convert$(EXEEXT) gij$(EXEEXT) \
|
@NATIVE_TRUE@am__EXEEXT_2 = jv-convert$(EXEEXT) gij$(EXEEXT) \
|
||||||
@NATIVE_TRUE@ grmic$(EXEEXT) grmiregistry$(EXEEXT) \
|
@NATIVE_TRUE@ grmic$(EXEEXT) grmiregistry$(EXEEXT) \
|
||||||
|
@ -973,6 +967,7 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la
|
||||||
libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
|
libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
|
||||||
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
|
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
|
||||||
|
|
||||||
|
libgij_la_LINK = $(CXXLINK) $(libgij_la_LDFLAGS)
|
||||||
@INTERPRETER_FALSE@libgcj_interpret_source_files =
|
@INTERPRETER_FALSE@libgcj_interpret_source_files =
|
||||||
@INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc
|
@INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc
|
||||||
libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.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_DEPENDENCIES = libgcj.la libgcj.spec
|
||||||
libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
|
libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
|
||||||
libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
|
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_SOURCES = $(xlib_nat_source_files)
|
||||||
lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo
|
lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo
|
||||||
lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
|
lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
2009-09-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
|
* src/Makefile.am (libstdc___la_LINK): New.
|
||||||
|
* src/Makefile.in: Regenerate.
|
||||||
|
|
||||||
2009-09-09 Loren J. Rittle <ljrittle@acm.org>
|
2009-09-09 Loren J. Rittle <ljrittle@acm.org>
|
||||||
|
|
||||||
* testsuite/30_threads/thread/native_handle/typesizes.cc: Remove
|
* testsuite/30_threads/thread/native_handle/typesizes.cc: Remove
|
||||||
|
|
|
@ -209,6 +209,8 @@ libstdc___la_DEPENDENCIES = \
|
||||||
libstdc___la_LDFLAGS = \
|
libstdc___la_LDFLAGS = \
|
||||||
-version-info $(libtool_VERSION) ${version_arg} -lm
|
-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
|
# Use special rules for the deprecated source files so that they find
|
||||||
# deprecated include files.
|
# deprecated include files.
|
||||||
GLIBCXX_INCLUDE_DIR=$(glibcxx_builddir)/include
|
GLIBCXX_INCLUDE_DIR=$(glibcxx_builddir)/include
|
||||||
|
|
|
@ -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)
|
thread.lo future.lo $(am__objects_1) $(am__objects_4)
|
||||||
am_libstdc___la_OBJECTS = $(am__objects_5)
|
am_libstdc___la_OBJECTS = $(am__objects_5)
|
||||||
libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS)
|
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)
|
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
|
||||||
depcomp =
|
depcomp =
|
||||||
am__depfiles_maybe =
|
am__depfiles_maybe =
|
||||||
|
@ -450,6 +447,7 @@ libstdc___la_DEPENDENCIES = \
|
||||||
libstdc___la_LDFLAGS = \
|
libstdc___la_LDFLAGS = \
|
||||||
-version-info $(libtool_VERSION) ${version_arg} -lm
|
-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
|
# Use special rules for the deprecated source files so that they find
|
||||||
# deprecated include files.
|
# deprecated include files.
|
||||||
|
|
Loading…
Reference in New Issue