procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

addr2name.awk: Remove.

Browse source 
* 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
This commit is contained in:
Mark Mitchell 2009-02-09 22:52:08 +00:00 • committed by Mark Mitchell
parent 71c8958e67
commit 48965b7c6d
6 changed files with 34 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libjava/ChangeLog
View file

@ -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

9
libjava/Makefile.am
View file

@ -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@

12
libjava/Makefile.in
View file

@ -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 = \

46
libjava/addr2name.awk
View file

@ -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();
}

3
libjava/configure vendored
View file

@ -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"

3
libjava/configure.ac
View file

@ -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"