* 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

6 files changed, 34 insertions, 54 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 96e39ca4a6d..76cc1951236 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,18 @@
+2009-02-09  Mark Mitchell  <mark@codesourcery.com>
+
+	* 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.
+
 2009-02-03  Jakub Jelinek  <jakub@redhat.com>
 
 	* gnu/gcj/convert/Convert.java (version): Update copyright notice
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@
 
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 = \
diff --git a/libjava/addr2name.awk b/libjava/addr2name.awk
deleted file mode 100755
index f31befd526d..00000000000
--- a/libjava/addr2name.awk
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/awk -f
-
-# Copyright (C) 2000  Free Software Foundation
-
-#    This file is part of libgcj.
-
-# This software is copyrighted work licensed under the terms of the
-# Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-# details.
-
-# This script emulates a little of the functionality of addr2line for
-# those systems that don't have it.  The only command line argument is
-# an executable name.  The script reads hexadecimal addresses from
-# stdin and prints the corresponding symbol names to stdout.  The
-# addresses must begin with "0x" and be fully zero filled or this
-# won't work.
-
-BEGIN {
-  object = ARGV[1];
-  ARGV[1] = "";
-
-  while ("nm " object "| sort" | getline) {
-    if ($2 == "t" || $2 == "T") {
-      address[i] = "0x" $1; name[i] = $3;
-      i++;
-    }
-  }
-  syms = i;
-}
-
-{
-  lo = 0;
-  hi = syms - 1;
-
-  while ((hi-1) > lo)
-    {
-      try = int ((hi + lo) / 2);
-      if ($0 < address[try])
-	hi = try;
-      else if ($0 >= address[try])
-	lo = try;
-    }
-  print name[lo] "\n"; fflush();
-}
-
-    
diff --git a/libjava/configure b/libjava/configure
index ec7dc2c02ff..9b8f52f0a3c 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -18795,6 +18795,9 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     enable_sjlj_exceptions=yes
   elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then
     enable_sjlj_exceptions=no
+  elif grep __cxa_end_cleanup conftest.s >/dev/null 2>&1 ; then
+    # ARM EH ABI.
+    enable_sjlj_exceptions=no
   fi
 fi
 CXXFLAGS="$old_CXXFLAGS"
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 91adc20facb..87194312104 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -675,6 +675,9 @@ if AC_TRY_EVAL(ac_compile); then
     enable_sjlj_exceptions=yes
   elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then
     enable_sjlj_exceptions=no
+  elif grep __cxa_end_cleanup conftest.s >/dev/null 2>&1 ; then
+    # ARM EH ABI.
+    enable_sjlj_exceptions=no
   fi
 fi
 CXXFLAGS="$old_CXXFLAGS"