diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-02-09 22:52:08 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-02-09 22:52:08 +0000 |
| commit | 3ce8cd5bf94464698cfc48bc10af4764d4770326 (patch) | |
| tree | ec1c19d82568c9bac01072efe4d3acb8c95220e6 /libjava/Makefile.am | |
| parent | 386c4baf2a3d4ab994486d08de666590dfea199f (diff) | |
| download | gcc-3ce8cd5bf94464698cfc48bc10af4764d4770326.tar.gz | |
* addr2name.awk: Remove.
* Makefile.am (bin_SCRIPTS): Remove addr2name.awk.
* Makefile.in: Regenerated.
* configure.ac: Define enable_sjlj_exceptions
appropriately under the ARM EH ABI.
* configure: Regenerated.
* Makefile.am (LTLDFLAGS): Define.
(GCJLINK): Use it.
(LIBLINK): Likewise.
* Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@144046 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 1964ec56b20..382a642e4eb 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -98,7 +98,7 @@ endif dbexec_DATA = $(db_name) endif -bin_SCRIPTS = addr2name.awk contrib/rebuild-gcj-db contrib/aot-compile +bin_SCRIPTS = contrib/rebuild-gcj-db contrib/aot-compile if INSTALL_AOT_RPM bin_SCRIPTS += contrib/aot-compile-rpm @@ -128,12 +128,15 @@ if ANONVERSCRIPT extra_ldflags_libjava += -Wl,--version-script=$(srcdir)/libgcj.ver endif +LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \ - $(LDFLAGS) -o $@ + $(LTLDFLAGS) -o $@ GCJ_FOR_ECJX = @GCJ_FOR_ECJX@ GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@ LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \ - $(LDFLAGS) $(extra_ldflags_libjava) $(extra_ldflags) -o $@ + $(LTLDFLAGS) $(extra_ldflags_libjava) $(extra_ldflags) -o $@ +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ |