aboutsummaryrefslogtreecommitdiff
path: root/libjava/Makefile.in
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2009-02-09 22:52:08 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2009-02-09 22:52:08 +0000
commit48965b7c6d095bd06be35733d84dba0e016e206d (patch)
treeec1c19d82568c9bac01072efe4d3acb8c95220e6 /libjava/Makefile.in
parent71c8958e6748de19ef2f674cc576e4a873c03236 (diff)
downloadgcc-48965b7c6d095bd06be35733d84dba0e016e206d.tar.gz
gcc-48965b7c6d095bd06be35733d84dba0e016e206d.tar.bz2
gcc-48965b7c6d095bd06be35733d84dba0e016e206d.zip
addr2name.awk: Remove.
* 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. From-SVN: r144046
Diffstat (limited to 'libjava/Makefile.in')
-rw-r--r--libjava/Makefile.in12
1 files changed, 7 insertions, 5 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index bc6f16ed663..b172d01f4de 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -532,8 +532,6 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
GCJCOMPILE = $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
LTGCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ) \
$(AM_GCJFLAGS) $(GCJFLAGS)
@@ -929,15 +927,19 @@ db_pathtail = $(gcjsubdir)/$(db_name)
@NATIVE_TRUE@ gcjh gjavah gnative2ascii gorbd grmid gserialver \
@NATIVE_TRUE@ gtnameserv gc-analyze $(am__append_5)
@NATIVE_TRUE@dbexec_DATA = $(db_name)
-bin_SCRIPTS = addr2name.awk contrib/rebuild-gcj-db contrib/aot-compile \
+bin_SCRIPTS = contrib/rebuild-gcj-db contrib/aot-compile \
$(am__append_7)
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
+LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
- $(LDFLAGS) -o $@
+ $(LTLDFLAGS) -o $@
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 $@
WARNINGS = -Wextra -Wall
AM_CXXFLAGS = \