Merge lp:~aviksil/ubuntu/natty/ltrace/merge-with-upstream into lp:ubuntu/natty/ltrace

[Avik Sil]

Merged the latest upstream available today

Unmerged revisions

18. By Avik Sil on 2011-03-15

* Add memmove prototype to etc/ltrace.conf
* New upstream release
* Support for cris added
* Numerous bugfixes for MIPS, ARM, and PPC
* Support for libunwind and libdl

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2011-03-15 17:56:13 +0000
@@ -0,0 +1,53 @@
+*.la
+*.so
+*.lo
+*.o
+*.ltrace
+*~
+
+Makefile
+Makefile.in
+
+.deps
+.dirstamp
+.libs
+
+/aclocal.m4
+/autom4te.cache
+/config
+/config.h
+/config.h.in
+/config.log
+/config.status
+/configure
+/libtool
+/ltrace
+/ltrace-*.tar.*
+/stamp-h1
+
+site.exp
+site.bak
+ltrace.log
+ltrace.sum
+testrun.log
+testrun.sum
+
+testsuite/ltrace.main/main
+testsuite/ltrace.main/main-internal
+testsuite/ltrace.main/parameters
+testsuite/ltrace.main/signals
+testsuite/ltrace.main/system_calls
+testsuite/ltrace.minor/attach-process
+testsuite/ltrace.minor/count-record
+testsuite/ltrace.minor/demangle
+testsuite/ltrace.minor/libdl-simple
+testsuite/ltrace.minor/print-instruction-pointer
+testsuite/ltrace.minor/time-record-T
+testsuite/ltrace.minor/time-record-tt
+testsuite/ltrace.minor/time-record-ttt
+testsuite/ltrace.minor/trace-clone
+testsuite/ltrace.minor/trace-exec
+testsuite/ltrace.minor/trace-exec1
+testsuite/ltrace.minor/trace-fork
+testsuite/ltrace.torture/signals
+

=== modified file 'ChangeLog'
--- ChangeLog	2010-10-01 16:06:14 +0000
+++ ChangeLog	2011-03-15 17:56:13 +0000
@@ -1,7 +1,270 @@
[phone]  Petr Machata  <[e-mail]>
+
+	* etc/ltrace.conf: Add memmove.
+
[phone]  Joe Damato  <[e-mail]>
+
+	* New release 0.6.0
+
[phone]  Zachary T Welch <[e-mail]>
+
+	* configure.ac: Make warning output independent of debug option.
+	  Add option to allow -Werror to be disabled. Switch CFLAGS,
+	  CPPFLAGS, and LDFLAGS to their AM_ variants to allow users to
+	  provide alternate settings during 'make'.  Remove -g/-O1/-O2
+	  options from configure script; autoconf sets them appropriately
+	  and the user should be in control of the desired optimizations.
+	  Check elf_hash parameter to see if it is signed/unsigned char,
+	  setting ELF_HASH_TAKES_SIGNED_CHAR as appropriate.
+	* handle_event.c (handle_breakpoint): Fix regression in
+	  system_calls.exp test on ARMv7a.  Also fixes libdl-simple.exp
+	  test on same platform.
+	* display_args.c, ltrace-elf.[ch], options.[ch],
+	  sysdeps/linux-gnu/{arm/trace,proc,trace}.c: Eliminate warnings
+	  that will cause build to fail with -Werror; these mostly were
+	  changes to avoid signed/unsigned comparisions.
+	* ltrace-elf.c (in_load_libraries): Use ELF_HASH_TAKES_SIGNED_CHAR
+
[phone]  Zachary T Welch <[e-mail]>
+
+	* configure.ac: Fix e-mail address.
+	* testsuite/lib/ltrace.exp: Fix failure reporting string
+	* ltrace-elf.c, sysdeps/linux-gnu/proc.c: Use portable
+	  format specifiers from inttypes.h
+	* sysdeps/linux-gnu/trace.c (umovebytes): Remove unused variable
+	* Makefile.am: Fix distribution of renamed debian/control file.
+	* testsuite/ltrace.minor/Makefile.am: Include libdl-simple test
+	  in the distribution tarballs.
+
[phone]  Joe Damato  <[e-mail]>
+
+	* debian/control.in: Renamed to debian/control.
+	* debian/control: Added new build dependencies.
+	* debian/rules: Added support for autotools.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* testsuite/ltrace.main/system_calls.exp: On s390x, names of mmap,
+	fstat and stat system calls are different.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* testsuite/lib/ltrace.exp (ltrace_verify_output): Add function
+	argument with grep flavor to use.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* testsuite/lib/ltrace.exp (ltrace_verify_output): Add function
+	argument with grep flavor to use.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* sysdeps/linux-gnu/ppc/ptrace.h (GET_FPREG): New macro.
+	(proc_archdep): Drop func_args, sysc_args.
+	* sysdeps/linux-gnu/ppc/trace.c: Use GET_FPREG.
+
[phone]  Zachary T Welch <zwelch@codesourcery,com>
+
+	* testsuite/: Convert to autotools and add to distribution.
+	  Update test files to allow out-of-tree builds.
+	* configure.ac: Add maintainer mode, create Makefiles in
+	  testsuite/ tree, improve --with-libunwind configuration
+	  to accept non-standard install path.
+	* Makefile.am: Don't distribute autogen.sh and .gitignore.
+	  Remove config.h.in during 'make maintainer-clean'
+	* .gitignore: Exclude test suite build/run artifacts.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* common.h: Add arch_ptr to callstack_element
+	* handle_event.c: Move callstack manipulation so that it's around
+	the output calls--push before output_left, pop after output_right.
+	(callstack_pop): Free the arch_ptr if it was set.
+	* sysdeps/linux-gnu/x86_64/ptrace.h: Split the archdep struct to
+	the proc part and the callstack_element part.
+	* sysdeps/linux-gnu/x86_64/trace.c (save_register_args): Init
+	callstack_element.arch_ptr.
+	(gimme_arg): Use it.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* testsuite/ltrace.main/parameters.* (func_work, func_call): new
+	functions for testing nested library calls
+
[phone]  Petr Machata  <[e-mail]>
+
+	* sysdeps/linux-gnu/x86_64/trace.c: Fix passing and returning
+	float and double values.
+	* sysdeps/linux-gnu/x86_64/ptrace.h: Likewise.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* testsuite/ltrace.main/parameters.* (func_float): now returns
+	float to test proper decoding of float return values.
+	(func_double): new function similar to func_float.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* configure.ac: Don't assume that libelf comes with a .pc file.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* configure.ac: ${host_cpu} for PPC64 is "powerpc64".
+
[phone]  Petr Machata  <[e-mail]>
+
+	* configure.ac: ${host_cpu} for PPC64 is "powerpc64".
+
[phone]  Joe Damato <[e-mail]>
+
+	* Makefile.am: Add autotool support for libunwind.
+	* configure.ac: Ditto.
+	* common.h: New structure fields for libunwind.
+	* execute_program.c: Initialize libunwind.
+	* proc.c: Ditto.
+	* options.c: New command line option (-w).
+	* options.h: New options parameter for libunwind.
+	* output.c: Use libunwind to do backtraces.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* ltrace-elf.c (loaddata): Refactored code for loading Elf_Data.
+	(inside, maybe_pick_section, get_section_covering, read32be): New
+	functions.
+	(get_glink_vma): New function, computes .plt glink_vma address on
+	PPCs.
+	(do_init_elf): Load DT_PPC_GOT, .plt on PPC.
+	Use loaddata to load section data.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* handle_event.c (handle_breakpoint): Do not assume that we can
+	find the breakpoint by address.
+
[phone]  Petr Machata  <[e-mail]>
+
+	* sysdeps/linux-gnu/ppc/ptrace.h (proc_archdep): New structure.
+	* sysdeps/linux-gnu/ppc/trace.c
+	(get_arch_dep): Initialize proc->arch_ptr.
+	(gimme_arg_regset, gimme_retval): New functions.
+	(gimme_arg): Dispatch to gimme_retval or gimme_arg_regset.
+	(save_register_args): Fill in the stub.
+
[phone]  Petr Machata <[e-mail]>
+
+	* sysdeps/linux-gnu/s390/trace.c: Support 5th argument fetching on s390.
+	  Contributed by Supriya Kannery.
+	* sysdeps/linux-gnu/s390/arch.h: Add support for fork/exec on 390.
+	* output.c: Cleanup.
+
[phone]  Petr Machata <[e-mail]>
+
+	* ltrace.1: Remove claim that only 32-bit binaries are supported.
+	* testsuite/ltrace.minor/trace-fork.exp: Make fork test suite more accurate
+
[phone]  Edgar E. Iglesias  <[e-mail]>
+
+	* sysdeps/linux-gnu/cris/Makefile: New.
+	* sysdeps/linux-gnu/cris/arch.h: Ditto.
+	* sysdeps/linux-gnu/cris/plt.c: Ditto.
+	* sysdeps/linux-gnu/cris/ptrace.h: Ditto.
+	* sysdeps/linux-gnu/cris/regs.c: Ditto.
+	* sysdeps/linux-gnu/cris/signalent.h: Ditto.
+	* sysdeps/linux-gnu/cris/syscallent.h: Ditto.
+	* sysdeps/linux-gnu/cris/trace.c: Ditto.
+
[phone]  Zach Welch <[e-mail]>
+
+	* Ensure Thumb mode gets set correct when updating ARM PC.
+
[phone]  Zach Welch <[e-mail]>
+
+	* Allow ARM PLT lookups to work when containing Thumb stubs.
+
[phone]  Zach Welch <[e-mail]>
+
+	* Improve breakpoint insertion to work with Thumb procedures.
+
 2010-09-30  Zach Welch <[e-mail]>
 
 	* Improve ARM syscall_p to handle Thumb-2 syscalls.
 
[phone]  Marc Kleine-Budde <[e-mail]>
+
+	* .gitignore: added git ignore
+
+	* Makefile.in, VERSION, aclocal.m4, configure, mkdist,
+	sysdeps/linux-gnu/Makefile, sysdeps/linux-gnu/alpha/Makefile,
+	sysdeps/linux-gnu/arm/Makefile, sysdeps/linux-gnu/i386/Makefile,
+	sysdeps/linux-gnu/ia64/Makefile, sysdeps/linux-gnu/m68k/Makefile,
+	sysdeps/linux-gnu/mipsel/Makefile, sysdeps/linux-gnu/ppc/Makefile,
+	sysdeps/linux-gnu/s390/Makefile, sysdeps/linux-gnu/sparc/Makefile,
+	sysdeps/linux-gnu/x86_64/Makefile: autotoolization: remove to-be
+	generated file This patch remove all files that will be
+	autogenerated by the autoools from the tree.
+
+	* Makefile.am, autogen.sh, configure.ac, sysdeps/Makefile.am,
+	sysdeps/linux-gnu/Makefile.am,
+	sysdeps/linux-gnu/alpha/Makefile.am,
+	sysdeps/linux-gnu/arch_syscallent.h,
+	sysdeps/linux-gnu/arm/Makefile.am,
+	sysdeps/linux-gnu/i386/Makefile.am,
+	sysdeps/linux-gnu/ia64/Makefile.am,
+	sysdeps/linux-gnu/m68k/Makefile.am,
+	sysdeps/linux-gnu/mipsel/Makefile.am,
+	sysdeps/linux-gnu/ppc/Makefile.am,
+	sysdeps/linux-gnu/s390/Makefile.am,
+	sysdeps/linux-gnu/signalent1.h,
+	sysdeps/linux-gnu/sparc/Makefile.am,
+	sysdeps/linux-gnu/syscallent1.h,
+	sysdeps/linux-gnu/x86_64/Makefile.am, sysdeps/sysdep.h:
+	autotoolization: add basic autotools infrastructure This patch add
+	a basic autotools infrastructure to ltrace. Native compilation on
+	i386, x86_64 and ppc. Cross compilation has been tested against
+	arm.
+
+	* common.h, elf.c, elf.h, ltrace-elf.c, ltrace-elf.h: rename
+	elf.{c,h} into ltrace-elf.{c,h} This patch renames these files to
+	avoid a conflict with the header files of the "libelfg0-dev"
+	package. This avoids the "-iquote" magic.
+
[phone]  Arnaud Patard <[e-mail]>
+
+	* sysdeps/linux-gnu/mipsel/mipsel.h: Add floating point register offset.
+	* sysdeps/linux-gnu/x86_64/{ptrace.h, trace.c}: Save a copy of register vlaues and handle floats.
+	* sysdeps/linux-gnu/mips: Symlink created.
+	* sysdeps/linux-gnu/mipsel/trace.c: Handle more argument types.
+	* sysdeps/linux-gnu/trace.c: Don't use PTRACE_SINGLESTEP for MIPS.
+	* sysdeps/linux-gnu/arm/trace.c: Fix return value.
+	* handle_event.c: Fix for MIPS.
+	* sysdeps/linux-gnu/mipsel/{plt.c, regs.c}: Fix includes.
+	* sysdeps/linux-gnu/mipsetl/syscallent.h: Cleanup.
+	* sysdeps/linux-gnu/mipsel/signalent.h: Cleanup.
+	* sysdeps/linux-gnu/trace.c: Fix umovelong.
+	* .gitignore: New file.
+	* handle_event.c: abort() when call nesting too deep.
+	* testsuite/ltrace.minor/count-record.exp: Fix tests.
+	* handle_event.c: Handle functions which do not increase stack depth.
+	* testsuite/ltrace.torture/signals.c: Don't use magic numbers.
+	* testsuite/ltrace.minor/demangle-lib.cpp: Fix build failure.
+	* sysdeps/linux-gnu/mksyscallent_mips: New file.
+	* elf.c: Fix '-l' on MIPS.
+	* debug.h: Add macro guard.
+	* breakpoints.c: Fix MIPS breakpoints.
+
[phone]  Joe Damato <[e-mail]>
+
+	* handle_event.c: Do not print signals when -b is used.
+	* options.h, options.c: A new option (-b) was added.
+	* ltrace.1: Documentation for -b was added.
+
[phone]  Joe Damato <[e-mail]>
+
+	* options.c, options.h: A new option (-g) was added.
+	* ltrace.1: Documentation for -g was added.
+	* handle_event.c: Do not print when -g is used.
+	* elf.c: Ditto.
+
 2009-07-25  Juan Cespedes <[e-mail]>
 
 	* New release 0.5.3

=== added file 'Makefile.am'
--- Makefile.am	1970-01-01 00:00:00 +0000
+++ Makefile.am	2011-03-15 17:56:13 +0000
@@ -0,0 +1,106 @@
+SUBDIRS = \
+	sysdeps \
+	. \
+	testsuite
+
+AM_CPPFLAGS += \
+	$(libelf_CFLAGS) \
+	-DSYSCONFDIR=\"$(sysconfdir)\"
+
+noinst_LTLIBRARIES = \
+	libltrace.la
+
+libltrace_la_SOURCES = \
+	breakpoints.c \
+	debug.c \
+	demangle.c \
+	dict.c \
+	display_args.c \
+	ltrace-elf.c \
+	execute_program.c \
+	handle_event.c \
+	libltrace.c \
+	options.c \
+	output.c \
+	proc.c \
+	read_config_file.c  \
+	summary.c
+
+libltrace_la_LIBADD = \
+	$(libelf_LIBS) \
+	$(liberty_LIBS) \
+	$(libsupcxx_LIBS) \
+	$(libunwind_LIBS) \
+	$(libunwind_ptrace_LIBS) \
+	$(libunwind_arch_LIBS) \
+	sysdeps/libos.la
+
+
+bin_PROGRAMS = \
+	ltrace
+
+ltrace_SOURCES = \
+	main.c
+
+ltrace_LDADD = \
+	libltrace.la
+
+
+noinst_HEADERS = \
+	common.h \
+	debug.h \
+	defs.h \
+	demangle.h \
+	dict.h \
+	ltrace-elf.h \
+	ltrace.h \
+	options.h \
+	output.h \
+	read_config_file.h
+
+dist_man1_MANS = \
+	ltrace.1
+
+dist_doc_DATA = \
+	COPYING \
+	README \
+	TODO \
+	BUGS \
+	ChangeLog
+
+dist_sysconf_DATA = \
+	etc/ltrace.conf
+
+EXTRA_DIST = \
+	ltrace.spec \
+	debian/changelog \
+	debian/compat \
+	debian/control \
+	debian/copyright \
+	debian/rules
+
+MAINTAINERCLEANFILES = \
+	configure \
+	Makefile.in \
+	aclocal.m4 \
+	config.h.in \
+	config.h.in~ \
+	config/autoconf/compile \
+	config/autoconf/config.guess \
+	config/autoconf/config.sub \
+	config/autoconf/depcomp \
+	config/autoconf/install-sh \
+	config/autoconf/ltmain.sh \
+	config/autoconf/mdate-sh \
+	config/autoconf/missing \
+	config/autoconf/texinfo.tex \
+	libtool.m4 \
+	ltoptions.m4 \
+	ltsugar.m4 \
+	ltversion.m4 \
+	lt~obsolete.m4 \
+	$(DIST_ARCHIVES)
+
+maintainer-clean-local:
+	-chmod -R a+rw $(distdir)
+	-rm -fr $(distdir)

=== removed file 'Makefile.in'
--- Makefile.in	2009-07-28 16:44:35 +0000
+++ Makefile.in	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-#
-# ltrace's Makefile.in
-#
-
-#OS		:= $(shell uname -s)
-OS		:= @HOST_OS@
-
-TOPDIR		= $(shell pwd)
-
-prefix		= @prefix@
-sysconfdir	= @sysconfdir@
-bindir		= $(prefix)/bin
-mandir		= @mandir@
-docdir		= $(prefix)/share/doc/ltrace
-
-CC		=	@CC@
-CFLAGS		=	-Wall @CFLAGS@
-CPPFLAGS	=	-iquote $(TOPDIR) -iquote $(TOPDIR)/sysdeps/$(OS) -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@
-LDFLAGS		=	@LDFLAGS@
-LIBS		=	@LIBS@
-
-INSTALL		=	@INSTALL@
-INSTALL_FILE	=	$(INSTALL) -p    -m  644
-INSTALL_PROGRAM	=	$(INSTALL) -p    -m  755
-INSTALL_SCRIPT	=	$(INSTALL) -p    -m  755
-INSTALL_DIR	=	$(INSTALL) -p -d -m  755
-
-OBJ	=	libltrace.o options.o elf.o output.o read_config_file.o  \
-		execute_program.o handle_event.o display_args.o          \
-		breakpoints.o proc.o demangle.o dict.o debug.o summary.o
-
-VERSION	=	@PACKAGE_VERSION@
-
-all:		ltrace
-
-ltrace:		main.o libltrace.a
-		$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
-
-libltrace.a: 	sysdeps/sysdep.o $(OBJ)
-		$(AR) rcv $@ $^
-
-sysdeps/sysdep.o: dummy
-		$(MAKE) -C sysdeps/$(OS)
-
-clean-deja:
-		$(RM) testrun.log testrun.sum
-		cd testsuite; make clean
-
-clean:		clean-deja
-		$(MAKE) -C sysdeps/$(OS) clean
-		rm -f ltrace main.o libltrace.a $(OBJ)
-		rm -f *~ *.bak a.out core
-
-distclean:	clean
-		rm -f config.h Makefile
-
-realclean:	distclean
-
-install:	ltrace
-		$(INSTALL_DIR) $(DESTDIR)$(bindir) $(DESTDIR)$(docdir) $(DESTDIR)$(mandir)/man1
-		$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)
-		$(INSTALL_PROGRAM) ltrace $(DESTDIR)$(bindir)
-		$(INSTALL_FILE) etc/ltrace.conf $(DESTDIR)$(sysconfdir)
-		$(INSTALL_FILE) COPYING README TODO BUGS ChangeLog $(DESTDIR)$(docdir)
-		$(INSTALL_FILE) ltrace.1 $(DESTDIR)$(mandir)/man1
-
-check:
-		cd testsuite;cat /proc/version;uptime;free -m;$(MAKE) check
-
-dummy:
-
-.PHONY:		all clean distclean dist install dummy
-
-.EXPORT_ALL_VARIABLES:

=== modified file 'README'
--- README	2009-07-28 16:44:35 +0000
+++ README	2011-03-15 17:56:13 +0000
@@ -37,6 +37,7 @@
 * Ian Wienand <[e-mail]> (IA64 port)
 * Eric Vaitl <[e-mail]> (mipsel port)
 * Petr Machata <[e-mail]> (misc fixes)
+* Joe Damato <[e-mail]> (libdl support, libunwind support)
 
 1. Introduction
 ---------------

=== removed file 'VERSION'
--- VERSION	2009-07-25 16:24:38 +0000
+++ VERSION	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-0.5.3

=== removed file 'aclocal.m4'
--- aclocal.m4	2008-05-27 10:51:22 +0000
+++ aclocal.m4	1970-01-01 00:00:00 +0000
@@ -1,833 +0,0 @@
-dnl aclocal.m4t generated automatically by aclocal 1.4-p6
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-# lib-prefix.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
-
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIB[]NAME"
-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  undefine([Name])
-  undefine([NAME])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE(rpath,
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib$1-prefix],
-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux*) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux*) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
-
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
-*)
-  acl_cv_prog_gnu_ld=no ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
-      *)
-	test "$with_gnu_ld" != yes && break ;;
-      esac
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
-

=== added file 'autogen.sh'
--- autogen.sh	1970-01-01 00:00:00 +0000
+++ autogen.sh	2011-03-15 17:56:13 +0000
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+#
+# usage:
+#
+# banner <target name>
+#
+banner() {
+	echo
+	TG=`echo $1 | sed -e "s,/.*/,,g"`
+	LINE=`echo $TG |sed -e "s/./-/g"`
+	echo $LINE
+	echo $TG
+	echo $LINE
+	echo
+}
+
+banner "autoreconf"
+
+mkdir -p config/autoconf config/m4
+autoreconf --force --install --symlink -Wall || exit $?
+
+banner "Finished"

=== modified file 'breakpoints.c'
--- breakpoints.c	2009-07-28 16:44:35 +0000
+++ breakpoints.c	2011-03-15 17:56:13 +0000
@@ -23,6 +23,12 @@
 		  struct library_symbol *libsym) {
 	Breakpoint *sbp;
 
+#ifdef __arm__
+	int thumb_mode = (int)addr & 1;
+	if (thumb_mode)
+		addr = (void *)((int)addr & ~1);
+#endif
+
 	debug(DEBUG_FUNCTION, "insert_breakpoint(pid=%d, addr=%p, symbol=%s)", proc->pid, addr, libsym ? libsym->name : "NULL");
 	debug(1, "symbol=%s, addr=%p", libsym?libsym->name:"(nil)", addr);
 
@@ -43,7 +49,7 @@
 		sbp->libsym = libsym;
 	}
 #ifdef __arm__
-	sbp->thumb_mode = proc->thumb_mode;
+	sbp->thumb_mode = thumb_mode | proc->thumb_mode;
 	proc->thumb_mode = 0;
 #endif
 	sbp->enabled++;
@@ -123,8 +129,8 @@
 					continue;
 				}
 				debug(2,"inserting bp %p %s",addr,sym->name);
-				new_sym=malloc(sizeof(*new_sym));
-				memcpy(new_sym,sym,sizeof(*new_sym));
+				new_sym=malloc(sizeof(*new_sym) + strlen(sym->name) + 1);
+				memcpy(new_sym,sym,sizeof(*new_sym) + strlen(sym->name) + 1);
 				new_sym->next=proc->list_of_symbols;
 				proc->list_of_symbols=new_sym;
 				insert_breakpoint(proc, addr, new_sym);

=== modified file 'common.h'
--- common.h	2009-07-25 16:24:38 +0000
+++ common.h	2011-03-15 17:56:13 +0000
@@ -1,3 +1,7 @@
+#if defined(HAVE_LIBUNWIND)
+#include <libunwind.h>
+#endif /* defined(HAVE_LIBUNWIND) */
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
@@ -7,7 +11,7 @@
 #include "dict.h"
 #include "sysdep.h"
 #include "debug.h"
-#include "elf.h"
+#include "ltrace-elf.h"
 #include "read_config_file.h"
 
 #if defined HAVE_LIBIBERTY || defined HAVE_LIBSUPC__
@@ -145,6 +149,7 @@
 	int is_syscall;
 	void * return_addr;
 	struct timeval time_spent;
+	void * arch_ptr;
 };
 
 #define MAX_CALLDEPTH 64
@@ -171,7 +176,10 @@
 	struct callstack_element callstack[MAX_CALLDEPTH];
 	struct library_symbol * list_of_symbols;
 
+	int libdl_hooked;
 	/* Arch-dependent: */
+	void * debug;	/* arch-dep process debug struct */
+	long debug_state; /* arch-dep debug state */
 	void * instruction_pointer;
 	void * stack_pointer;      /* To get return addr, args... */
 	void * return_addr;
@@ -186,6 +194,12 @@
 	/* output: */
 	enum tof type_being_displayed;
 
+#if defined(HAVE_LIBUNWIND)
+	/* libunwind address space */
+	unw_addr_space_t unwind_as;
+	void *unwind_priv;
+#endif /* defined(HAVE_LIBUNWIND) */
+
 	Process * next;
 };
 
@@ -222,6 +236,14 @@
 extern void show_summary(void);
 extern arg_type_info * lookup_prototype(enum arg_type at);
 
+extern void do_init_elf(struct ltelf *lte, const char *filename);
+extern void do_close_elf(struct ltelf *lte);
+extern int in_load_libraries(const char *name, struct ltelf *lte, size_t count, GElf_Sym *sym);
+extern struct library_symbol *library_symbols;
+extern void add_library_symbol(GElf_Addr addr, const char *name,
+		struct library_symbol **library_symbolspp,
+		enum toplt type_of_plt, int is_weak);
+
 /* Arch-dependent stuff: */
 extern char * pid2name(pid_t pid);
 extern void trace_set_options(Process * proc, pid_t pid);
@@ -245,9 +267,10 @@
 extern void save_register_args(enum tof type, Process * proc);
 extern int umovestr(Process * proc, void * addr, int len, void * laddr);
 extern int umovelong (Process * proc, void * addr, long * result, arg_type_info * info);
+extern size_t umovebytes (Process *proc, void * addr, void * laddr, size_t count);
 extern int ffcheck(void * maddr);
 extern void * sym2addr(Process *, struct library_symbol *);
+extern int linkmap_init(Process *, struct ltelf *);
+extern void arch_check_dbg(Process *proc);
 
-#if 0				/* not yet */
-extern int umoven(Process * proc, void * addr, int len, void * laddr);
-#endif
+extern struct ltelf main_lte;

=== removed file 'configure'
--- configure	2009-07-28 16:44:35 +0000
+++ configure	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-#!/bin/sh
-
-if [ ! -f libltrace.c ]
-then
-  echo "configure: error: cannot find sources (libltrace.c)" 1>&2
-  exit 1
-fi
-
-echo -n "checking package name... "
-PACKAGE_NAME='ltrace'
-echo $PACKAGE_NAME
-
-echo -n "checking $PACKAGE_NAME version... "
-PACKAGE_VERSION=$( cat VERSION )
-echo $PACKAGE_VERSION
-
-echo -n "checking HOST_OS... "
-HOST_OS=$( uname -s )
-if [ "$HOST_OS" = "Linux" ]
-then
-  HOST_OS="linux-gnu"
-fi
-echo $HOST_OS
-
-# HAVE_LIBIBERTY
-echo -n "checking for cplus_demangle in -liberty... "
-cat > conftest.c << EOF
-char cplus_demangle();
-int main () {
-  return cplus_demangle();
-}
-EOF
-if gcc conftest.c -liberty 2>/dev/null
-then
-  HAVE_LIBIBERTY=1
-  echo "yes"
-else
-  unset HAVE_LIBIBERTY
-  echo "no"
-fi
-rm -f conftest.c a.out
-
-# HAVE_LIBSUPC__
-echo -n "checking for __cxa_demangle in -lsupc++... "
-cat > conftest.c << EOF
-char __cxa_demangle();
-int main () {
-  return __cxa_demangle();
-}
-EOF
-if gcc conftest.c -lsupc++ 2>/dev/null
-then
-  HAVE_LIBSUPC__=1
-  echo "yes"
-else
-  unset HAVE_LIBSUPC__
-  echo "no"
-fi
-rm -f conftest.c a.out
-
-# HAVE_ELF_C_READ_MMAP
-echo -n "checking whether elf_begin accepts ELF_C_READ_MMAP... "
-cat > conftest.c << EOF
-#include <gelf.h>
-int main () {
-  Elf *elf = elf_begin (4, ELF_C_READ_MMAP, 0);
-  return 0;
-}
-EOF
-if gcc conftest.c 2>/dev/null
-then
-  HAVE_ELF_C_READ_MMAP=1
-  echo "yes"
-else
-  unset HAVE_ELF_C_READ_MMAP
-  echo "no"
-fi
-rm -f conftest.c a.out
-
-CC=gcc
-CPPFLAGS=' -I /usr/include/libelf'
-CFLAGS='-g -O2'
-LIBS='-lelf -lsupc++ -liberty '
-INSTALL='/usr/bin/install -c'
-iquote='-iquote '
-iquoteend=''
-
-prefix=/usr/local
-sysconfdir='${prefix}/etc'
-bindir='${prefix}/bin'
-mandir='${prefix}/share/man'
-docdir='${prefix}/share/doc/ltrace'
-for x_option
-do
-  if test -n "$x_prev"; then
-    eval $x_prev=\$x_option
-    x_prev=
-    continue
-  fi
-  case $x_option in
-    --*=* | *=*)
-      x_var=`echo $x_option | sed 's/^--//' | sed 's/=.*//'`
-      x_val=`echo $x_option | sed 's/^.*=//'`
-      eval $x_var=$x_val
-      ;;
-    --*)
-      x_prev=`echo $x_option | sed 's/^--//'`
-      ;;
-  esac
-done
-
-echo "configure: creating Makefile"
-#
-# Makefile.in -> Makefile
-#
-x_subst_vars='PACKAGE_VERSION HOST_OS INSTALL CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir'
-
-for i in $x_subst_vars
-do
-  x_val=`eval echo \\"\\$$i\\"`
-  x_sed="$x_sed
-s&@$i@&$x_val&g"
-done
-
-sed "$x_sed" Makefile.in > Makefile
-
-echo "configure: creating config.h"
-#
-# config.h
-#
-exec > config.h
-
-echo '#define PACKAGE_NAME "ltrace"'
-echo '#define PACKAGE_VERSION "'$PACKAGE_VERSION'"'
-
-if [ "$HAVE_LIBIBERTY" ]
-then
-  echo '#define HAVE_LIBIBERTY 1'
-else
-  echo '#undef HAVE_LIBIBERTY'
-fi
-
-if [ "$HAVE_LIBSUPC__" ]
-then
-  echo '#define HAVE_LIBSUPC__ 1'
-else
-  echo '#undef HAVE_LIBSUPC__'
-fi
-
-if [ "$HAVE_ELF_C_READ_MMAP" ]
-then
-  echo '#define HAVE_ELF_C_READ_MMAP 1'
-else
-  echo '#undef HAVE_ELF_C_READ_MMAP'
-fi
-
-exit 0

=== added file 'configure.ac'
--- configure.ac	1970-01-01 00:00:00 +0000
+++ configure.ac	2011-03-15 17:56:13 +0000
@@ -0,0 +1,272 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.59)
+
+AC_INIT([ltrace],[0.6.0],[[e-mail]])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR(libltrace.c)
+#AC_CONFIG_MACRO_DIR([config/m4])
+AC_CONFIG_AUX_DIR([config/autoconf])
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+
+case "${host_os}" in
+    linux-gnu*)	HOST_OS="linux-gnu" ;;
+    *)		AC_MSG_ERROR([unkown host-os ${host_osx}]) ;;
+esac
+AC_SUBST(HOST_OS)
+
+case "${host_cpu}" in
+    arm*|sa110)		HOST_CPU="arm" ;;
+    i?86)		HOST_CPU="i386" ;;
+    powerpc|powerpc64)	HOST_CPU="ppc" ;;
+    sun4u|sparc64)	HOST_CPU="sparc" ;;
+    s390x)		HOST_CPU="s390" ;;
+    *)			HOST_CPU="${host_cpu}" ;;
+esac
+AC_SUBST(HOST_CPU)
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_LIBTOOL
+# libtool-2:  LT_INIT()
+AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
+AM_MAINTAINER_MODE
+
+AC_ARG_WITH([libelf],
+  AS_HELP_STRING([--with-libelf], [Prefix of libelf headers/library]),
+  [case "${withval}" in
+  (no)
+    AC_MSG_ERROR([*** libelf is a required dependency])
+    ;;
+  (yes)
+    AC_MSG_ERROR([*** --with-libelf requires you to specify a path])
+    ;;
+  (*)
+    AM_CPPFLAGS="${AM_CPPFLAGS} -I${withval}/include"
+    AM_LDFLAGS="${AM_LDFLAGS} -L${withval}/lib"
+    libelf_LD_LIBRARY_PATH="${withval}/lib"
+    ;;
+esac],[])
+
+# Checks for libraries.
+
+saved_CPPFLAGS="${CPPFLAGS}"
+saved_LDFLAGS="${LDFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${AM_CPPFLAGS}"
+LDFLAGS="${LDFLAGS} ${AM_LDFLAGS}"
+# libelf
+AC_CHECK_HEADERS([elf.h gelf.h],,
+	[AC_MSG_ERROR([*** libelf.h or gelf.h not found on your system])]
+)
+AC_CHECK_LIB([elf], [elf_begin],,
+	[AC_MSG_ERROR([*** libelf not found on your system])]
+)
+CPPFLAGS="${saved_CPPFLAGS}"
+LDFLAGS="${saved_LDFLAGS}"
+
+
+# HAVE_LIBIBERTY
+AC_CHECK_LIB([iberty], [cplus_demangle], [
+	AC_DEFINE([HAVE_LIBIBERTY], [1], [we have libiberty])
+	liberty_LIBS="-liberty"], [
+	liberty_LIBS=""])
+AC_SUBST(liberty_LIBS)
+
+
+# HAVE_LIBSUPC__
+AC_CHECK_LIB([supc++], [__cxa_demangle], [
+	AC_DEFINE([HAVE_LIBSUPC__], [1], [we have libsupc++])
+	libsupcxx_LIBS="-lsupc++"], [
+	libsupcxx_LIBS=""])
+AC_SUBST(libsupcxx_LIBS)
+
+
+# HAVE_LIBUNWIND
+AC_ARG_WITH(libunwind,
+  AS_HELP_STRING([--with-libunwind], [Use libunwind frame unwinding support]),
+  [case "${withval}" in
+  (yes|no) enable_libunwind=$withval;;
+  (*) enable_libunwind=yes
+    AM_CPPFLAGS="${AM_CPPFLAGS} -I${withval}/include"
+    AM_LDFLAGS="${AM_LDFLAGS} -L${withval}/lib"
+    libunwind_LD_LIBRARY_PATH="${withval}/lib"
+    ;;
+esac],[enable_libunwind=maybe])
+
+saved_CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${AM_CPPFLAGS}"
+AC_CHECK_HEADERS([libunwind.h], [have_libunwind_h=yes])
+AC_CHECK_HEADERS([libunwind-ptrace.h], [have_libunwind_ptrace_h=yes])
+CPPFLAGS="${saved_CPPFLAGS}"
+
+AC_MSG_CHECKING([whether to use libunwind support])
+case "${enable_libunwind}" in
+(yes|maybe)
+  if test x$have_libunwind_h = xyes -o x$have_libunwind_ptrace_h = xyes; then
+    enable_libunwind=yes
+  elif test $enable_libunwind = maybe; then
+    enable_libunwind=no
+  else
+    AC_MSG_RESULT([$enable_libunwind])
+    AC_MSG_ERROR([libunwind.h or libunwind-ptrace.h cannot be found])	
+  fi
+  ;;
+(*) ;;
+esac
+AC_MSG_RESULT([$enable_libunwind])
+
+if test x"$enable_libunwind" = xyes; then
+  saved_LDFLAGS="${LDFLAGS}"
+  LDFLAGS="${LDFLAGS} ${AM_LDFLAGS}"
+  AC_CHECK_LIB(unwind, backtrace, libunwind_LIBS=-lunwind, libunwind_LIBS=)
+  AC_SUBST(libunwind_LIBS)
+  AC_CHECK_LIB(unwind-ptrace, _UPT_create, libunwind_ptrace_LIBS=-lunwind-ptrace, libunwind_ptrace_LIBS=)
+  AC_SUBST(libunwind_ptrace_LIBS)
+
+  case "${host_cpu}" in
+      arm*|sa110)         UNWIND_ARCH="arm" ;;
+      i?86)               UNWIND_ARCH="x86" ;;
+      powerpc)            UNWIND_ARCH="ppc32" ;;
+      ppc64)              UNWIND_ARCH="ppc64" ;;
+      mips*)              UNWIND_ARCH="mips" ;;
+      *)                  UNWIND_ARCH="${host_cpu}" ;;
+  esac
+
+  AC_CHECK_LIB(unwind-${UNWIND_ARCH}, _U${UNWIND_ARCH}_init_remote, libunwind_arch_LIBS=-lunwind-${UNWIND_ARCH}, libunwind_arch_LIBS=)
+  AC_SUBST(libunwind_arch_LIBS)
+  AC_DEFINE([HAVE_LIBUNWIND], [1], [we have libunwind])
+  LDFLAGS="${saved_LDFLAGS}"
+fi
+
+
+saved_CPPFLAGS="${CPPFLAGS}"
+saved_LDFLAGS="${LDFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${AM_CPPFLAGS}"
+LDFLAGS="${LDFLAGS} ${AM_LDFLAGS}"
+# HAVE_ELF_C_READ_MMAP
+AC_MSG_CHECKING([whether elf_begin accepts ELF_C_READ_MMAP])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gelf.h>]], [[
+int main () {
+	Elf *elf = elf_begin(4, ELF_C_READ_MMAP, 0);
+	return 0;
+}
+	]])],[
+	AC_DEFINE([HAVE_ELF_C_READ_MMAP], [1], [we have read mmap support])
+	AC_MSG_RESULT([yes])],[
+	AC_MSG_RESULT([no])])
+
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${CFLAGS} -Wall -Werror"
+AC_MSG_CHECKING([whether elf_hash takes a signed char string])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libelf.h>]], [[
+	(void) elf_hash("name");
+	]])],
+	[AC_DEFINE([ELF_HASH_TAKES_SIGNED_CHAR], [1],
+		[elf_hash() takes signed char])
+	 AC_MSG_RESULT([yes])],
+	[AC_MSG_RESULT([no])])
+CFLAGS="${saved_CFLAGS}"
+CPPFLAGS="${saved_CPPFLAGS}"
+LDFLAGS="${saved_LDFLAGS}"
+
+AM_CPPFLAGS=" \
+	${AM_CPPFLAGS} \
+	-I\$(top_srcdir)/sysdeps/${HOST_OS}/${HOST_CPU} \
+	-I\$(top_srcdir)/sysdeps/${HOST_OS} \
+	-I\$(top_srcdir)/sysdeps \
+	-I\$(top_srcdir) \
+"
+
+# Checks for header files.
+AC_CHECK_HEADERS([ \
+	fcntl.h \
+	limits.h \
+	stddef.h \
+	stdint.h \
+	stdlib.h \
+	string.h \
+	sys/ioctl.h \
+	sys/param.h \
+	sys/time.h \
+	unistd.h \
+])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_UID_T
+AC_C_INLINE
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_CHECK_SIZEOF([long])
+
+
+# Checks for library functions.
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_FORK
+AC_CHECK_FUNCS([ \
+	alarm \
+	atexit \
+	getcwd \
+	gettimeofday \
+	memset \
+	mkdir \
+	rmdir \
+	strchr \
+	strdup \
+	strerror \
+	strtol \
+	strtoul \
+])
+
+
+#
+# Debugging
+#
+AC_MSG_CHECKING([whether to enable debugging])
+AC_ARG_ENABLE(debug,
+    AS_HELP_STRING([--enable-debug], [enable debugging @<:@default=no@:>@]),
+	[case "$enableval" in
+	y | yes) CONFIG_DEBUG=yes ;;
+        *) CONFIG_DEBUG=no ;;
+    esac],
+    [CONFIG_DEBUG=no])
+AC_MSG_RESULT([${CONFIG_DEBUG}])
+if test "${CONFIG_DEBUG}" = "yes"; then
+    AC_DEFINE(DEBUG, 1, [debugging])
+fi
+
+# Ignore the compiler's warnings at your own risk.
+AM_CFLAGS="${AM_CFLAGS} -Wall -Wsign-compare -Wfloat-equal -Wformat-security"
+AC_ARG_ENABLE([werror],
+    AS_HELP_STRING([--disable-werror], [disable use of -Werror]),
+    [enable_werror=$enableval], [enable_werror=yes])
+if test x$enable_werror = xyes; then
+    AM_CFLAGS="${AM_CFLAGS} -Werror"
+fi
+
+AC_SUBST(AM_CPPFLAGS)
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_LDFLAGS)
+AC_SUBST(libelf_LD_LIBRARY_PATH)
+AC_SUBST(libunwind_LD_LIBRARY_PATH)
+
+AC_CONFIG_FILES([
+	Makefile
+	sysdeps/Makefile
+	sysdeps/linux-gnu/Makefile
+	sysdeps/linux-gnu/alpha/Makefile
+	sysdeps/linux-gnu/arm/Makefile
+	sysdeps/linux-gnu/i386/Makefile
+	sysdeps/linux-gnu/ia64/Makefile
+	sysdeps/linux-gnu/m68k/Makefile
+	sysdeps/linux-gnu/mipsel/Makefile
+	sysdeps/linux-gnu/ppc/Makefile
+	sysdeps/linux-gnu/s390/Makefile
+	sysdeps/linux-gnu/sparc/Makefile
+	sysdeps/linux-gnu/x86_64/Makefile
+	testsuite/Makefile
+	testsuite/ltrace.main/Makefile
+	testsuite/ltrace.minor/Makefile
+	testsuite/ltrace.torture/Makefile
+])
+AC_OUTPUT

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-24 17:58:11 +0000
+++ debian/changelog	2011-03-15 17:56:13 +0000
@@ -1,3 +1,18 @@
+ltrace (0.6-1ubuntu1) natty; urgency=low
+
+  * Add memmove prototype to etc/ltrace.con
+
+ -- Avik Sil <[e-mail]>  Tue, 15 Mar 2011 17:48:04 +0530
+
+ltrace (0.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Support for cris added
+  * Numerous bugfixes for MIPS, ARM, and PPC
+  * Support for libunwind and libdl
+
+ -- Joe Damato <[e-mail]>  Fri, 10 Dec 2010 00:41:20 -0800
+
 ltrace (0.5.3-2.1ubuntu1) natty; urgency=low
 
   * Merge with Debian; remaining changes:

=== modified file 'debian/control'
--- debian/control	2010-11-24 17:58:11 +0000
+++ debian/control	2011-03-15 17:56:13 +0000
@@ -1,13 +1,12 @@
 Source: ltrace
 Section: utils
 Priority: optional
-Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Juan Cespedes <[e-mail]>
+Maintainer: Juan Cespedes <[e-mail]>
 Standards-Version: 3.8.2
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), binutils-dev, libelf-dev
+Build-Depends: cdbs, debhelper (>= 7), dh-autoreconf, binutils-dev, libelfg0-dev, libunwind7-dev [i386 amd64 ia64]
 
 Package: ltrace
-Architecture: i386 arm armeb armel m68k s390 powerpc sparc alpha amd64 ia64 ppc64
+Architecture: i386 arm armeb armel s390 powerpc sparc alpha amd64 ia64 ppc64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Tracks runtime library calls in dynamically linked programs
  ltrace is a debugging program which runs a specified command until it

=== removed file 'debian/control.in'
--- debian/control.in	2010-11-24 17:58:11 +0000
+++ debian/control.in	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-Source: ltrace
-Section: utils
-Priority: optional
-Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Juan Cespedes <[e-mail]>
-Maintainer: Juan Cespedes <[e-mail]>
-Standards-Version: 3.8.2
-Build-Depends: @cdbs@, binutils-dev, libelf-dev
-
-Package: ltrace
-Architecture: i386 arm armeb armel m68k s390 powerpc sparc alpha amd64 ia64 ppc64
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Tracks runtime library calls in dynamically linked programs
- ltrace is a debugging program which runs a specified command until it
- exits.  While the command is executing, ltrace intercepts and records
- the dynamic library calls which are called by
- the executed process and the signals received by that process.
- It can also intercept and print the system calls executed by the program.
- .
- The program to be traced need not be recompiled for this, so you can
- use it on binaries for which you don't have the source handy.
- .
- You should install ltrace if you need a sysadmin tool for tracking the
- execution of processes.
-

=== modified file 'debian/rules'
--- debian/rules	2009-01-06 17:46:28 +0000
+++ debian/rules	2011-03-15 17:56:13 +0000
@@ -6,6 +6,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 install/ltrace::
 	rm -f debian/ltrace/usr/share/doc/ltrace/*

=== modified file 'debug.h'
--- debug.h	2009-07-28 16:44:35 +0000
+++ debug.h	2011-03-15 17:56:13 +0000
@@ -1,3 +1,6 @@
+#ifndef _DEBUG_H
+#define _DEBUG_H
+
 #include <features.h>
 
 /* debug levels:
@@ -15,3 +18,4 @@
 
 # define debug(level, expr...) debug_(level, __FILE__, __LINE__, expr)
 
+#endif

=== modified file 'defs.h'
--- defs.h	2009-07-28 16:44:35 +0000
+++ defs.h	2011-03-15 17:56:13 +0000
@@ -15,4 +15,4 @@
 #define DEFAULT_ARRAYLEN  4	/* default maximum # array elements */
 #endif				/* (-A switch) */
 
-#define MAX_LIBRARIES 30
+#define MAX_LIBRARIES 200

=== modified file 'display_args.c'
--- display_args.c	2009-07-28 16:44:35 +0000
+++ display_args.c	2011-03-15 17:56:13 +0000
@@ -15,8 +15,8 @@
 static int display_unknown(enum tof type, Process *proc, long value);
 static int display_format(enum tof type, Process *proc, int arg_num);
 
-static int string_maxlength = INT_MAX;
-static int array_maxlength = INT_MAX;
+static size_t string_maxlength = INT_MAX;
+static size_t array_maxlength = INT_MAX;
 
 static long
 get_length(enum tof type, Process *proc, int len_spec,
@@ -59,8 +59,8 @@
 			    void *addr, arg_type_info * info,
 			    void *st, arg_type_info* st_info) {
 	int len = 0;
-	int i;
-	int array_len;
+	size_t i;
+	size_t array_len;
 
 	if (addr == NULL)
 		return fprintf(options.output, "NULL");
@@ -143,7 +143,7 @@
 static int
 display_enum(enum tof type, Process *proc,
 		arg_type_info* info, long value) {
-	int ii;
+	size_t ii;
 	for (ii = 0; ii < info->u.enum_info.entries; ++ii) {
 		if (info->u.enum_info.values[ii] == value)
 			return fprintf(options.output, "%s", info->u.enum_info.keys[ii]);
@@ -281,7 +281,7 @@
 display_string(enum tof type, Process *proc, void *addr,
 			  size_t maxlength) {
 	unsigned char *str1;
-	int i;
+	size_t i;
 	int len = 0;
 
 	if (!addr) {
@@ -328,7 +328,7 @@
 	void *addr;
 	unsigned char *str1;
 	int i;
-	int len = 0;
+	size_t len = 0;
 	arg_type_info info;
 
 	info.type = ARGTYPE_POINTER;

=== removed file 'elf.c'
--- elf.c	2009-07-28 16:44:35 +0000
+++ elf.c	1970-01-01 00:00:00 +0000
@@ -1,619 +0,0 @@
-# include "config.h"
-
-#include <endian.h>
-#include <errno.h>
-#include <error.h>
-#include <fcntl.h>
-#include <gelf.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "common.h"
-
-static void do_init_elf(struct ltelf *lte, const char *filename);
-static void do_close_elf(struct ltelf *lte);
-static void add_library_symbol(GElf_Addr addr, const char *name,
-			       struct library_symbol **library_symbolspp,
-			       enum toplt type_of_plt, int is_weak);
-static int in_load_libraries(const char *name, struct ltelf *lte);
-static GElf_Addr opd2addr(struct ltelf *ltc, GElf_Addr addr);
-
-#ifdef PLT_REINITALISATION_BP
-extern char *PLTs_initialized_by_here;
-#endif
-
-static void
-do_init_elf(struct ltelf *lte, const char *filename) {
-	int i;
-	GElf_Addr relplt_addr = 0;
-	size_t relplt_size = 0;
-
-	debug(DEBUG_FUNCTION, "do_init_elf(filename=%s)", filename);
-	debug(1, "Reading ELF from %s...", filename);
-
-	memset(lte, 0, sizeof(*lte));
-	lte->fd = open(filename, O_RDONLY);
-	if (lte->fd == -1)
-		error(EXIT_FAILURE, errno, "Can't open \"%s\"", filename);
-
-#ifdef HAVE_ELF_C_READ_MMAP
-	lte->elf = elf_begin(lte->fd, ELF_C_READ_MMAP, NULL);
-#else
-	lte->elf = elf_begin(lte->fd, ELF_C_READ, NULL);
-#endif
-
-	if (lte->elf == NULL || elf_kind(lte->elf) != ELF_K_ELF)
-		error(EXIT_FAILURE, 0, "Can't open ELF file \"%s\"", filename);
-
-	if (gelf_getehdr(lte->elf, &lte->ehdr) == NULL)
-		error(EXIT_FAILURE, 0, "Can't read ELF header of \"%s\"",
-		      filename);
-
-	if (lte->ehdr.e_type != ET_EXEC && lte->ehdr.e_type != ET_DYN)
-		error(EXIT_FAILURE, 0,
-		      "\"%s\" is not an ELF executable nor shared library",
-		      filename);
-
-	if ((lte->ehdr.e_ident[EI_CLASS] != LT_ELFCLASS
-	     || lte->ehdr.e_machine != LT_ELF_MACHINE)
-#ifdef LT_ELF_MACHINE2
-	    && (lte->ehdr.e_ident[EI_CLASS] != LT_ELFCLASS2
-		|| lte->ehdr.e_machine != LT_ELF_MACHINE2)
-#endif
-#ifdef LT_ELF_MACHINE3
-	    && (lte->ehdr.e_ident[EI_CLASS] != LT_ELFCLASS3
-		|| lte->ehdr.e_machine != LT_ELF_MACHINE3)
-#endif
-	    )
-		error(EXIT_FAILURE, 0,
-		      "\"%s\" is ELF from incompatible architecture", filename);
-
-	for (i = 1; i < lte->ehdr.e_shnum; ++i) {
-		Elf_Scn *scn;
-		GElf_Shdr shdr;
-		const char *name;
-
-		scn = elf_getscn(lte->elf, i);
-		if (scn == NULL || gelf_getshdr(scn, &shdr) == NULL)
-			error(EXIT_FAILURE, 0,
-			      "Couldn't get section header from \"%s\"",
-			      filename);
-
-		name = elf_strptr(lte->elf, lte->ehdr.e_shstrndx, shdr.sh_name);
-		if (name == NULL)
-			error(EXIT_FAILURE, 0,
-			      "Couldn't get section header from \"%s\"",
-			      filename);
-
-		if (shdr.sh_type == SHT_SYMTAB) {
-			Elf_Data *data;
-
-			lte->symtab = elf_getdata(scn, NULL);
-			lte->symtab_count = shdr.sh_size / shdr.sh_entsize;
-			if ((lte->symtab == NULL
-			     || elf_getdata(scn, lte->symtab) != NULL)
-			    && opt_x != NULL)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get .symtab data from \"%s\"",
-				      filename);
-
-			scn = elf_getscn(lte->elf, shdr.sh_link);
-			if (scn == NULL || gelf_getshdr(scn, &shdr) == NULL)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get section header from \"%s\"",
-				      filename);
-
-			data = elf_getdata(scn, NULL);
-			if (data == NULL || elf_getdata(scn, data) != NULL
-			    || shdr.sh_size != data->d_size || data->d_off)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get .strtab data from \"%s\"",
-				      filename);
-
-			lte->strtab = data->d_buf;
-		} else if (shdr.sh_type == SHT_DYNSYM) {
-			Elf_Data *data;
-
-			lte->dynsym = elf_getdata(scn, NULL);
-			lte->dynsym_count = shdr.sh_size / shdr.sh_entsize;
-			if (lte->dynsym == NULL
-			    || elf_getdata(scn, lte->dynsym) != NULL)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get .dynsym data from \"%s\"",
-				      filename);
-
-			scn = elf_getscn(lte->elf, shdr.sh_link);
-			if (scn == NULL || gelf_getshdr(scn, &shdr) == NULL)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get section header from \"%s\"",
-				      filename);
-
-			data = elf_getdata(scn, NULL);
-			if (data == NULL || elf_getdata(scn, data) != NULL
-			    || shdr.sh_size != data->d_size || data->d_off)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get .dynstr data from \"%s\"",
-				      filename);
-
-			lte->dynstr = data->d_buf;
-		} else if (shdr.sh_type == SHT_DYNAMIC) {
-			Elf_Data *data;
-			size_t j;
-
-			data = elf_getdata(scn, NULL);
-			if (data == NULL || elf_getdata(scn, data) != NULL)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get .dynamic data from \"%s\"",
-				      filename);
-
-			for (j = 0; j < shdr.sh_size / shdr.sh_entsize; ++j) {
-				GElf_Dyn dyn;
-
-				if (gelf_getdyn(data, j, &dyn) == NULL)
-					error(EXIT_FAILURE, 0,
-					      "Couldn't get .dynamic data from \"%s\"",
-					      filename);
-#ifdef __mips__
-/**
-  MIPS ABI Supplement:
-
-  DT_PLTGOT This member holds the address of the .got section.
-
-  DT_MIPS_SYMTABNO This member holds the number of entries in the
-  .dynsym section.
-
-  DT_MIPS_LOCAL_GOTNO This member holds the number of local global
-  offset table entries.
-
-  DT_MIPS_GOTSYM This member holds the index of the first dyamic
-  symbol table entry that corresponds to an entry in the gobal offset
-  table.
-
- */
-				if(dyn.d_tag==DT_PLTGOT){
-					lte->pltgot_addr=dyn.d_un.d_ptr;
-				}
-				if(dyn.d_tag==DT_MIPS_LOCAL_GOTNO){
-					lte->mips_local_gotno=dyn.d_un.d_val;
-				}
-				if(dyn.d_tag==DT_MIPS_GOTSYM){
-					lte->mips_gotsym=dyn.d_un.d_val;
-				}
-#endif // __mips__
-				if (dyn.d_tag == DT_JMPREL)
-					relplt_addr = dyn.d_un.d_ptr;
-				else if (dyn.d_tag == DT_PLTRELSZ)
-					relplt_size = dyn.d_un.d_val;
-			}
-		} else if (shdr.sh_type == SHT_HASH) {
-			Elf_Data *data;
-			size_t j;
-
-			lte->hash_type = SHT_HASH;
-
-			data = elf_getdata(scn, NULL);
-			if (data == NULL || elf_getdata(scn, data) != NULL
-			    || data->d_off || data->d_size != shdr.sh_size)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get .hash data from \"%s\"",
-				      filename);
-
-			if (shdr.sh_entsize == 4) {
-				/* Standard conforming ELF.  */
-				if (data->d_type != ELF_T_WORD)
-					error(EXIT_FAILURE, 0,
-					      "Couldn't get .hash data from \"%s\"",
-					      filename);
-				lte->hash = (Elf32_Word *) data->d_buf;
-			} else if (shdr.sh_entsize == 8) {
-				/* Alpha or s390x.  */
-				Elf32_Word *dst, *src;
-				size_t hash_count = data->d_size / 8;
-
-				lte->hash = (Elf32_Word *)
-				    malloc(hash_count * sizeof(Elf32_Word));
-				if (lte->hash == NULL)
-					error(EXIT_FAILURE, 0,
-					      "Couldn't convert .hash section from \"%s\"",
-					      filename);
-				lte->lte_flags |= LTE_HASH_MALLOCED;
-				dst = lte->hash;
-				src = (Elf32_Word *) data->d_buf;
-				if ((data->d_type == ELF_T_WORD
-				     && __BYTE_ORDER == __BIG_ENDIAN)
-				    || (data->d_type == ELF_T_XWORD
-					&& lte->ehdr.e_ident[EI_DATA] ==
-					ELFDATA2MSB))
-					++src;
-				for (j = 0; j < hash_count; ++j, src += 2)
-					*dst++ = *src;
-			} else
-				error(EXIT_FAILURE, 0,
-				      "Unknown .hash sh_entsize in \"%s\"",
-				      filename);
-		} else if (shdr.sh_type == SHT_GNU_HASH
-			   && lte->hash == NULL) {
-			Elf_Data *data;
-
-			lte->hash_type = SHT_GNU_HASH;
-
-			if (shdr.sh_entsize != 0
-			    && shdr.sh_entsize != 4) {
-				error(EXIT_FAILURE, 0,
-				      ".gnu.hash sh_entsize in \"%s\" should be 4, but is %llu",
-				      filename, shdr.sh_entsize);
-			}
-
-			data = elf_getdata(scn, NULL);
-			if (data == NULL || elf_getdata(scn, data) != NULL
-			    || data->d_off || data->d_size != shdr.sh_size)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get .gnu.hash data from \"%s\"",
-				      filename);
-
-			lte->hash = (Elf32_Word *) data->d_buf;
-		} else if (shdr.sh_type == SHT_PROGBITS
-			   || shdr.sh_type == SHT_NOBITS) {
-			if (strcmp(name, ".plt") == 0) {
-				lte->plt_addr = shdr.sh_addr;
-				lte->plt_size = shdr.sh_size;
-				if (shdr.sh_flags & SHF_EXECINSTR) {
-					lte->lte_flags |= LTE_PLT_EXECUTABLE;
-				}
-			}
-#ifdef ARCH_SUPPORTS_OPD
-			else if (strcmp(name, ".opd") == 0) {
-				lte->opd_addr = (GElf_Addr *) (long) shdr.sh_addr;
-				lte->opd_size = shdr.sh_size;
-				lte->opd = elf_rawdata(scn, NULL);
-			}
-#endif
-		}
-	}
-
-	if (lte->dynsym == NULL || lte->dynstr == NULL)
-		error(EXIT_FAILURE, 0,
-		      "Couldn't find .dynsym or .dynstr in \"%s\"", filename);
-
-	if (!relplt_addr || !lte->plt_addr) {
-		debug(1, "%s has no PLT relocations", filename);
-		lte->relplt = NULL;
-		lte->relplt_count = 0;
-	} else {
-		for (i = 1; i < lte->ehdr.e_shnum; ++i) {
-			Elf_Scn *scn;
-			GElf_Shdr shdr;
-
-			scn = elf_getscn(lte->elf, i);
-			if (scn == NULL || gelf_getshdr(scn, &shdr) == NULL)
-				error(EXIT_FAILURE, 0,
-				      "Couldn't get section header from \"%s\"",
-				      filename);
-			if (shdr.sh_addr == relplt_addr
-			    && shdr.sh_size == relplt_size) {
-				lte->relplt = elf_getdata(scn, NULL);
-				lte->relplt_count =
-				    shdr.sh_size / shdr.sh_entsize;
-				if (lte->relplt == NULL
-				    || elf_getdata(scn, lte->relplt) != NULL)
-					error(EXIT_FAILURE, 0,
-					      "Couldn't get .rel*.plt data from \"%s\"",
-					      filename);
-				break;
-			}
-		}
-
-		if (i == lte->ehdr.e_shnum)
-			error(EXIT_FAILURE, 0,
-			      "Couldn't find .rel*.plt section in \"%s\"",
-			      filename);
-
-		debug(1, "%s %zd PLT relocations", filename, lte->relplt_count);
-	}
-}
-
-static void
-do_close_elf(struct ltelf *lte) {
-	debug(DEBUG_FUNCTION, "do_close_elf()");
-	if (lte->lte_flags & LTE_HASH_MALLOCED)
-		free((char *)lte->hash);
-	elf_end(lte->elf);
-	close(lte->fd);
-}
-
-static void
-add_library_symbol(GElf_Addr addr, const char *name,
-		   struct library_symbol **library_symbolspp,
-		   enum toplt type_of_plt, int is_weak) {
-	struct library_symbol *s;
-
-	debug(DEBUG_FUNCTION, "add_library_symbol()");
-
-	s = malloc(sizeof(struct library_symbol) + strlen(name) + 1);
-	if (s == NULL)
-		error(EXIT_FAILURE, errno, "add_library_symbol failed");
-
-	s->needs_init = 1;
-	s->is_weak = is_weak;
-	s->plt_type = type_of_plt;
-	s->next = *library_symbolspp;
-	s->enter_addr = (void *)(uintptr_t) addr;
-	s->name = (char *)(s + 1);
-	strcpy(s->name, name);
-	*library_symbolspp = s;
-
-	debug(2, "addr: %p, symbol: \"%s\"", (void *)(uintptr_t) addr, name);
-}
-
-/* stolen from elfutils-0.123 */
-static unsigned long
-private_elf_gnu_hash(const char *name) {
-	unsigned long h = 5381;
-	const unsigned char *string = (const unsigned char *)name;
-	unsigned char c;
-	for (c = *string; c; c = *++string)
-		h = h * 33 + c;
-	return h & 0xffffffff;
-}
-
-static int
-in_load_libraries(const char *name, struct ltelf *lte) {
-	size_t i;
-	unsigned long hash;
-	unsigned long gnu_hash;
-
-	if (!library_num)
-		return 1;
-
-	hash = elf_hash((const unsigned char *)name);
-	gnu_hash = private_elf_gnu_hash(name);
-	for (i = 1; i <= library_num; ++i) {
-		if (lte[i].hash == NULL)
-			continue;
-
-		if (lte[i].hash_type == SHT_GNU_HASH) {
-			Elf32_Word * hashbase = lte[i].hash;
-			Elf32_Word nbuckets = *hashbase++;
-			Elf32_Word symbias = *hashbase++;
-			Elf32_Word bitmask_nwords = *hashbase++;
-			Elf32_Word * buckets;
-			Elf32_Word * chain_zero;
-			Elf32_Word bucket;
-
-			// +1 for skipped `shift'
-			hashbase += lte[i].ehdr.e_ident[EI_CLASS] * bitmask_nwords + 1;
-			buckets = hashbase;
-			hashbase += nbuckets;
-			chain_zero = hashbase - symbias;
-			bucket = buckets[gnu_hash % nbuckets];
-
-			if (bucket != 0) {
-				const Elf32_Word *hasharr = &chain_zero[bucket];
-				do
-					if ((*hasharr & ~1u) == (gnu_hash & ~1u)) {
-						int symidx = hasharr - chain_zero;
-						GElf_Sym sym;
-
-						if (gelf_getsym(lte[i].dynsym, symidx, &sym) == NULL)
-							error(EXIT_FAILURE, 0,
-							      "Couldn't get symbol from .dynsym");
-
-						if (sym.st_value != 0
-						    && sym.st_shndx != SHN_UNDEF
-						    && strcmp(name, lte[i].dynstr + sym.st_name) == 0)
-							return 1;
-					}
-				while ((*hasharr++ & 1u) == 0);
-			}
-		} else {
-			Elf32_Word nbuckets, symndx;
-			Elf32_Word *buckets, *chain;
-			nbuckets = lte[i].hash[0];
-			buckets = &lte[i].hash[2];
-			chain = &lte[i].hash[2 + nbuckets];
-
-			for (symndx = buckets[hash % nbuckets];
-			     symndx != STN_UNDEF; symndx = chain[symndx]) {
-				GElf_Sym sym;
-
-				if (gelf_getsym(lte[i].dynsym, symndx, &sym) == NULL)
-					error(EXIT_FAILURE, 0,
-					      "Couldn't get symbol from .dynsym");
-
-				if (sym.st_value != 0
-				    && sym.st_shndx != SHN_UNDEF
-				    && strcmp(name, lte[i].dynstr + sym.st_name) == 0)
-					return 1;
-			}
-		}
-	}
-	return 0;
-}
-
-static GElf_Addr
-opd2addr(struct ltelf *lte, GElf_Addr addr) {
-#ifdef ARCH_SUPPORTS_OPD
-	unsigned long base, offset;
-
-	if (!lte->opd)
-		return addr;
-
-	base = (unsigned long)lte->opd->d_buf;
-	offset = (unsigned long)addr - (unsigned long)lte->opd_addr;
-	if (offset > lte->opd_size)
-		error(EXIT_FAILURE, 0, "static plt not in .opd");
-
-	return *(GElf_Addr*)(base + offset);
-#else //!ARCH_SUPPORTS_OPD
-	return addr;
-#endif
-}
-
-struct library_symbol *
-read_elf(Process *proc) {
-	struct library_symbol *library_symbols = NULL;
-	struct ltelf lte[MAX_LIBRARIES + 1];
-	size_t i;
-	struct opt_x_t *xptr;
-	struct library_symbol **lib_tail = NULL;
-	int exit_out = 0;
-
-	debug(DEBUG_FUNCTION, "read_elf(file=%s)", proc->filename);
-
-	elf_version(EV_CURRENT);
-
-	do_init_elf(lte, proc->filename);
-	proc->e_machine = lte->ehdr.e_machine;
-	for (i = 0; i < library_num; ++i)
-		do_init_elf(&lte[i + 1], library[i]);
-#ifdef __mips__
-	// MIPS doesn't use the PLT and the GOT entries get changed
-	// on startup.
-	proc->need_to_reinitialize_breakpoints = 1;
-	for(i=lte->mips_gotsym; i<lte->dynsym_count;i++){
-		GElf_Sym sym;
-		const char *name;
-		GElf_Addr addr = arch_plt_sym_val(lte, i, 0);
-		if (gelf_getsym(lte->dynsym, i, &sym) == NULL){
-			error(EXIT_FAILURE, 0,
-					"Couldn't get relocation from \"%s\"",
-					proc->filename);
-		}
-		name=lte->dynstr+sym.st_name;
-		if(ELF64_ST_TYPE(sym.st_info) != STT_FUNC){
-			debug(2,"sym %s not a function",name);
-			continue;
-		}
-		add_library_symbol(addr, name, &library_symbols, 0,
-				ELF64_ST_BIND(sym.st_info) != 0);
-		if (!lib_tail)
-			lib_tail = &(library_symbols->next);
-	}
-#else
-	for (i = 0; i < lte->relplt_count; ++i) {
-		GElf_Rel rel;
-		GElf_Rela rela;
-		GElf_Sym sym;
-		GElf_Addr addr;
-		void *ret;
-		const char *name;
-
-		if (lte->relplt->d_type == ELF_T_REL) {
-			ret = gelf_getrel(lte->relplt, i, &rel);
-			rela.r_offset = rel.r_offset;
-			rela.r_info = rel.r_info;
-			rela.r_addend = 0;
-		} else
-			ret = gelf_getrela(lte->relplt, i, &rela);
-
-		if (ret == NULL
-		    || ELF64_R_SYM(rela.r_info) >= lte->dynsym_count
-		    || gelf_getsym(lte->dynsym, ELF64_R_SYM(rela.r_info),
-				   &sym) == NULL)
-			error(EXIT_FAILURE, 0,
-			      "Couldn't get relocation from \"%s\"",
-			      proc->filename);
-
-#ifdef PLT_REINITALISATION_BP
-		if (!sym.st_value && PLTs_initialized_by_here)
-			proc->need_to_reinitialize_breakpoints = 1;
-#endif
-
-		name = lte->dynstr + sym.st_name;
-		if (in_load_libraries(name, lte)) {
-			addr = arch_plt_sym_val(lte, i, &rela);
-			add_library_symbol(addr, name, &library_symbols,
-					   (PLTS_ARE_EXECUTABLE(lte)
-					   ?  LS_TOPLT_EXEC : LS_TOPLT_POINT),
-					   ELF64_ST_BIND(sym.st_info) == STB_WEAK);
-			if (!lib_tail)
-				lib_tail = &(library_symbols->next);
-		}
-	}
-#endif // !__mips__
-#ifdef PLT_REINITALISATION_BP
-	struct opt_x_t *main_cheat;
-
-	if (proc->need_to_reinitialize_breakpoints) {
-		/* Add "PLTs_initialized_by_here" to opt_x list, if not
-		   already there. */
-		main_cheat = (struct opt_x_t *)malloc(sizeof(struct opt_x_t));
-		if (main_cheat == NULL)
-			error(EXIT_FAILURE, 0, "Couldn't allocate memory");
-		main_cheat->next = opt_x;
-		main_cheat->found = 0;
-		main_cheat->name = PLTs_initialized_by_here;
-
-		for (xptr = opt_x; xptr; xptr = xptr->next)
-			if (strcmp(xptr->name, PLTs_initialized_by_here) == 0
-			    && main_cheat) {
-				free(main_cheat);
-				main_cheat = NULL;
-				break;
-			}
-		if (main_cheat)
-			opt_x = main_cheat;
-	}
-#endif
-
-	for (i = 0; i < lte->symtab_count; ++i) {
-		GElf_Sym sym;
-		GElf_Addr addr;
-		const char *name;
-
-		if (gelf_getsym(lte->symtab, i, &sym) == NULL)
-			error(EXIT_FAILURE, 0,
-			      "Couldn't get symbol from \"%s\"",
-			      proc->filename);
-
-		name = lte->strtab + sym.st_name;
-		addr = sym.st_value;
-		if (!addr)
-			continue;
-
-		for (xptr = opt_x; xptr; xptr = xptr->next)
-			if (xptr->name && strcmp(xptr->name, name) == 0) {
-				/* FIXME: Should be able to use &library_symbols as above.  But
-				   when you do, none of the real library symbols cause breaks. */
-				add_library_symbol(opd2addr(lte, addr),
-						   name, lib_tail, LS_TOPLT_NONE, 0);
-				xptr->found = 1;
-				break;
-			}
-	}
-	for (xptr = opt_x; xptr; xptr = xptr->next)
-		if ( ! xptr->found) {
-			char *badthing = "WARNING";
-#ifdef PLT_REINITALISATION_BP
-			if (strcmp(xptr->name, PLTs_initialized_by_here) == 0) {
-				if (lte->ehdr.e_entry) {
-					add_library_symbol (
-						opd2addr (lte, lte->ehdr.e_entry),
-						PLTs_initialized_by_here,
-						lib_tail, 1, 0);
-					fprintf (stderr, "WARNING: Using e_ent"
-						 "ry from elf header (%p) for "
-						 "address of \"%s\"\n", (void*)
-						 (long) lte->ehdr.e_entry,
-						 PLTs_initialized_by_here);
-					continue;
-				}
-				badthing = "ERROR";
-				exit_out = 1;
-			}
-#endif
-			fprintf (stderr,
-				 "%s: Couldn't find symbol \"%s\" in file \"%s"
-			         "\"\n", badthing, xptr->name, proc->filename);
-		}
-	if (exit_out) {
-		exit (1);
-	}
-
-	for (i = 0; i < library_num + 1; ++i)
-		do_close_elf(&lte[i]);
-
-	return library_symbols;
-}

=== removed file 'elf.h'
--- elf.h	2009-07-28 16:44:35 +0000
+++ elf.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-#ifndef LTRACE_ELF_H
-#define LTRACE_ELF_H
-
-#include <gelf.h>
-#include <stdlib.h>
-
-struct ltelf {
-	int fd;
-	Elf *elf;
-	GElf_Ehdr ehdr;
-	Elf_Data *dynsym;
-	size_t dynsym_count;
-	const char *dynstr;
-	GElf_Addr plt_addr;
-	size_t plt_size;
-	Elf_Data *relplt;
-	size_t relplt_count;
-	Elf_Data *symtab;
-	const char *strtab;
-	size_t symtab_count;
-	Elf_Data *opd;
-	GElf_Addr *opd_addr;
-	size_t opd_size;
-	Elf32_Word *hash;
-	int hash_type;
-	int lte_flags;
-#ifdef __mips__
-	size_t pltgot_addr;
-	size_t mips_local_gotno;
-	size_t mips_gotsym;
-#endif // __mips__
-};
-
-#define LTE_HASH_MALLOCED 1
-#define LTE_PLT_EXECUTABLE 2
-
-#define PLTS_ARE_EXECUTABLE(lte) ((lte->lte_flags & LTE_PLT_EXECUTABLE) != 0)
-
-extern int library_num;
-extern char *library[MAX_LIBRARIES];
-
-extern struct library_symbol *read_elf(Process *);
-
-extern GElf_Addr arch_plt_sym_val(struct ltelf *, size_t, GElf_Rela *);
-
-#ifndef SHT_GNU_HASH
-#define SHT_GNU_HASH	0x6ffffff6	/* GNU-style hash table. */
-#endif
-#endif

=== modified file 'etc/ltrace.conf'
--- etc/ltrace.conf	2009-01-06 17:46:28 +0000
+++ etc/ltrace.conf	2011-03-15 17:56:13 +0000
@@ -317,6 +317,7 @@
 string index(string,char);
 addr memchr(string,char,ulong);
 addr memcpy(addr,string3,ulong);
+addr memmove(addr,string3,ulong);
 addr memset(addr,char,long);
 string rindex(string,char);
 addr stpcpy(addr,string);

=== modified file 'execute_program.c'
--- execute_program.c	2009-07-28 16:44:35 +0000
+++ execute_program.c	2011-03-15 17:56:13 +0000
@@ -1,5 +1,9 @@
 #include "config.h"
 
+#if defined(HAVE_LIBUNWIND)
+#include <libunwind-ptrace.h>
+#endif /* defined(HAVE_LIBUNWIND) */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ -87,5 +91,9 @@
 
 	sp->pid = pid;
 
+#if defined(HAVE_LIBUNWIND)
+	sp->unwind_priv = _UPT_create(pid);
+#endif /* defined(HAVE_LIBUNWIND) */
+
 	return;
 }

=== modified file 'handle_event.c'
--- handle_event.c	2009-07-25 16:24:38 +0000
+++ handle_event.c	2011-03-15 17:56:13 +0000
@@ -330,7 +330,7 @@
 		remove_proc(event->proc);
 		return;
 	}
-	if (event->proc->state != STATE_IGNORED) {
+	if (event->proc->state != STATE_IGNORED && !options.no_signals) {
 		output_line(event->proc, "--- %s (%s) ---",
 				shortsignal(event->proc, event->e_un.signum),
 				strsignal(event->e_un.signum));
@@ -386,14 +386,14 @@
 handle_syscall(Event *event) {
 	debug(DEBUG_FUNCTION, "handle_syscall(pid=%d, sysnum=%d)", event->proc->pid, event->e_un.sysnum);
 	if (event->proc->state != STATE_IGNORED) {
-		if (options.syscalls) {
-			output_left(LT_TOF_SYSCALL, event->proc,
-					sysname(event->proc, event->e_un.sysnum));
-		}
-		if (event->proc->breakpoints_enabled == 0) {
-			enable_all_breakpoints(event->proc);
-		}
 		callstack_push_syscall(event->proc, event->e_un.sysnum);
+		if (options.syscalls) {
+			output_left(LT_TOF_SYSCALL, event->proc,
+					sysname(event->proc, event->e_un.sysnum));
+		}
+		if (event->proc->breakpoints_enabled == 0) {
+			enable_all_breakpoints(event->proc);
+		}
 	}
 	continue_process(event->proc->pid);
 }
@@ -427,14 +427,14 @@
 handle_arch_syscall(Event *event) {
 	debug(DEBUG_FUNCTION, "handle_arch_syscall(pid=%d, sysnum=%d)", event->proc->pid, event->e_un.sysnum);
 	if (event->proc->state != STATE_IGNORED) {
-		if (options.syscalls) {
-			output_left(LT_TOF_SYSCALL, event->proc,
-					arch_sysname(event->proc, event->e_un.sysnum));
-		}
-		if (event->proc->breakpoints_enabled == 0) {
-			enable_all_breakpoints(event->proc);
-		}
 		callstack_push_syscall(event->proc, 0xf0000 + event->e_un.sysnum);
+		if (options.syscalls) {
+			output_left(LT_TOF_SYSCALL, event->proc,
+					arch_sysname(event->proc, event->e_un.sysnum));
+		}
+		if (event->proc->breakpoints_enabled == 0) {
+			enable_all_breakpoints(event->proc);
+		}
 	}
 	continue_process(event->proc->pid);
 }
@@ -470,11 +470,11 @@
 		if (opt_T || options.summary) {
 			calc_time_spent(event->proc);
 		}
-		callstack_pop(event->proc);
 		if (options.syscalls) {
 			output_right(LT_TOF_SYSCALLR, event->proc,
 					sysname(event->proc, event->e_un.sysnum));
 		}
+		callstack_pop(event->proc);
 	}
 	continue_process(event->proc->pid);
 }
@@ -486,15 +486,19 @@
 		if (opt_T || options.summary) {
 			calc_time_spent(event->proc);
 		}
-		callstack_pop(event->proc);
 		if (options.syscalls) {
 			output_right(LT_TOF_SYSCALLR, event->proc,
 					arch_sysname(event->proc, event->e_un.sysnum));
 		}
+		callstack_pop(event->proc);
 	}
 	continue_process(event->proc->pid);
 }
 
+#ifdef __powerpc__
+void *get_count_register (Process *proc);
+#endif
+
 static void
 handle_breakpoint(Event *event) {
 	int i, j;
@@ -561,25 +565,31 @@
 							  libsym);
 				}
 			} else {
-				sbp = dict_find_entry(event->proc->breakpoints, sym2addr(event->proc, libsym));
-				assert(sbp);
-				if (addr != sbp->addr) {
+				sbp = dict_find_entry(event->proc->breakpoints, addr);
+				/* On powerpc, the breakpoint address
+				   may end up being actual entry point
+				   of the library symbol, not the PLT
+				   address we computed.  In that case,
+				   sbp is NULL.  */
+				if (sbp == NULL || addr != sbp->addr) {
 					insert_breakpoint(event->proc, addr,
 							  libsym);
 				}
 			}
 #elif defined(__mips__)
-			void *addr;
-			void *old_addr;
+			void *addr = NULL;
 			struct library_symbol *sym= event->proc->callstack[i].c_un.libfunc;
+			struct library_symbol *new_sym;
 			assert(sym);
-			old_addr = dict_find_entry(event->proc->breakpoints, sym2addr(event->proc, sym))->addr;
 			addr=sym2addr(event->proc,sym);
-			assert(old_addr !=0 && addr !=0);
-			if(addr != old_addr){
-				struct library_symbol *new_sym;
-				new_sym=malloc(sizeof(*new_sym));
-				memcpy(new_sym,sym,sizeof(*new_sym));
+			sbp = dict_find_entry(event->proc->breakpoints, addr);
+			if (sbp) {
+				if (addr != sbp->addr) {
+					insert_breakpoint(event->proc, addr, sym);
+				}
+			} else {
+				new_sym=malloc(sizeof(*new_sym) + strlen(sym->name) + 1);
+				memcpy(new_sym,sym,sizeof(*new_sym) + strlen(sym->name) + 1);
 				new_sym->next=event->proc->list_of_symbols;
 				event->proc->list_of_symbols=new_sym;
 				insert_breakpoint(event->proc, addr, new_sym);
@@ -593,12 +603,12 @@
 					calc_time_spent(event->proc);
 				}
 			}
-			callstack_pop(event->proc);
 			event->proc->return_addr = event->e_un.brk_addr;
 			if (event->proc->state != STATE_IGNORED) {
 				output_right(LT_TOF_FUNCTIONR, event->proc,
 						event->proc->callstack[i].c_un.libfunc->name);
 			}
+			callstack_pop(event->proc);
 			continue_after_breakpoint(event->proc,
 					address2bpstruct(event->proc,
 						event->e_un.brk_addr));
@@ -607,12 +617,16 @@
 	}
 
 	if ((sbp = address2bpstruct(event->proc, event->e_un.brk_addr))) {
+		if (strcmp(sbp->libsym->name, "") == 0) {
+			debug(2, "Hit _dl_debug_state breakpoint!\n");
+			arch_check_dbg(event->proc);
+		}
 		if (event->proc->state != STATE_IGNORED) {
 			event->proc->stack_pointer = get_stack_pointer(event->proc);
 			event->proc->return_addr =
 				get_return_addr(event->proc, event->proc->stack_pointer);
+			callstack_push_symfunc(event->proc, sbp->libsym);
 			output_left(LT_TOF_FUNCTION, event->proc, sbp->libsym->name);
-			callstack_push_symfunc(event->proc, sbp->libsym);
 		}
 #ifdef PLT_REINITALISATION_BP
 		if (event->proc->need_to_reinitialize_breakpoints
@@ -625,7 +639,7 @@
 		return;
 	}
 
-	if (event->proc->state != STATE_IGNORED) {
+	if (event->proc->state != STATE_IGNORED && !options.no_plt) {
 		output_line(event->proc, "unexpected breakpoint at %p",
 				(void *)event->e_un.brk_addr);
 	}
@@ -639,7 +653,8 @@
 	debug(DEBUG_FUNCTION, "callstack_push_syscall(pid=%d, sysnum=%d)", proc->pid, sysnum);
 	/* FIXME: not good -- should use dynamic allocation. 19990703 mortene. */
 	if (proc->callstack_depth == MAX_CALLDEPTH - 1) {
-		fprintf(stderr, "Error: call nesting too deep!\n");
+		fprintf(stderr, "%s: Error: call nesting too deep!\n", __func__);
+		abort();
 		return;
 	}
 
@@ -657,15 +672,17 @@
 
 static void
 callstack_push_symfunc(Process *proc, struct library_symbol *sym) {
-	struct callstack_element *elem;
+	struct callstack_element *elem, *prev;
 
 	debug(DEBUG_FUNCTION, "callstack_push_symfunc(pid=%d, symbol=%s)", proc->pid, sym->name);
 	/* FIXME: not good -- should use dynamic allocation. 19990703 mortene. */
 	if (proc->callstack_depth == MAX_CALLDEPTH - 1) {
-		fprintf(stderr, "Error: call nesting too deep!\n");
+		fprintf(stderr, "%s: Error: call nesting too deep!\n", __func__);
+		abort();
 		return;
 	}
 
+	prev = &proc->callstack[proc->callstack_depth-1];
 	elem = &proc->callstack[proc->callstack_depth];
 	elem->is_syscall = 0;
 	elem->c_un.libfunc = sym;
@@ -675,7 +692,9 @@
 		insert_breakpoint(proc, elem->return_addr, 0);
 	}
 
-	proc->callstack_depth++;
+	/* handle functions like atexit() on mips which have no return */
+	if (elem->return_addr != prev->return_addr)
+		proc->callstack_depth++;
 	if (opt_T || options.summary) {
 		struct timezone tz;
 		gettimeofday(&elem->time_spent, &tz);
@@ -692,5 +711,9 @@
 	if (!elem->is_syscall && elem->return_addr) {
 		delete_breakpoint(proc, elem->return_addr);
 	}
+	if (elem->arch_ptr != NULL) {
+		free(elem->arch_ptr);
+		elem->arch_ptr = NULL;
+	}
 	proc->callstack_depth--;
 }

=== added file 'ltrace-elf.c'
--- ltrace-elf.c	1970-01-01 00:00:00 +0000
+++ ltrace-elf.c	2011-03-15 17:56:13 +0000
@@ -0,0 +1,827 @@
+#include "config.h"
+
+#include <endian.h>
+#include <errno.h>
+#include <error.h>
+#include <fcntl.h>
+#include <gelf.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <assert.h>
+
+#include "common.h"
+
+void do_init_elf(struct ltelf *lte, const char *filename);
+void do_close_elf(struct ltelf *lte);
+void add_library_symbol(GElf_Addr addr, const char *name,
+		struct library_symbol **library_symbolspp,
+		enum toplt type_of_plt, int is_weak);
+int in_load_libraries(const char *name, struct ltelf *lte, size_t count, GElf_Sym *sym);
+static GElf_Addr opd2addr(struct ltelf *ltc, GElf_Addr addr);
+
+struct library_symbol *library_symbols = NULL;
+struct ltelf main_lte;
+
+#ifdef PLT_REINITALISATION_BP
+extern char *PLTs_initialized_by_here;
+#endif
+
+#ifndef DT_PPC_GOT
+# define DT_PPC_GOT		(DT_LOPROC + 0)
+#endif
+
+#define PPC_PLT_STUB_SIZE 16
+
+static Elf_Data *loaddata(Elf_Scn *scn, GElf_Shdr *shdr)
+{
+	Elf_Data *data = elf_getdata(scn, NULL);
+	if (data == NULL || elf_getdata(scn, data) != NULL
+	    || data->d_off || data->d_size != shdr->sh_size)
+		return NULL;
+	return data;
+}
+
+static int inside(GElf_Addr addr, GElf_Shdr *shdr)
+{
+	return addr >= shdr->sh_addr
+		&& addr < shdr->sh_addr + shdr->sh_size;
+}
+
+static int maybe_pick_section(GElf_Addr addr,
+			      Elf_Scn *in_sec, GElf_Shdr *in_shdr,
+			      Elf_Scn **tgt_sec, GElf_Shdr *tgt_shdr)
+{
+	if (inside (addr, in_shdr)) {
+		*tgt_sec = in_sec;
+		*tgt_shdr = *in_shdr;
+		return 1;
+	}
+	return 0;
+}
+
+static int get_section_covering(struct ltelf *lte, GElf_Addr addr,
+				Elf_Scn **tgt_sec, GElf_Shdr *tgt_shdr)
+{
+	int i;
+	for (i = 1; i < lte->ehdr.e_shnum; ++i) {
+		Elf_Scn *scn;
+		GElf_Shdr shdr;
+
+		scn = elf_getscn(lte->elf, i);
+		if (scn == NULL || gelf_getshdr(scn, &shdr) == NULL) {
+			debug(1, "Couldn't read section or header.");
+			return 0;
+		}
+
+		if (maybe_pick_section(addr, scn, &shdr, tgt_sec, tgt_shdr))
+			return 1;
+	}
+
+	return 0;
+}
+
+static GElf_Addr read32be(Elf_Data *data, size_t offset)
+{
+	if (data->d_size < offset + 4) {
+		debug(1, "Not enough data to read 32bit value at offset %zd.",
+		      offset);
+		return 0;
+	}
+
+	unsigned char const *buf = data->d_buf + offset;
+	return ((Elf32_Word)buf[0] << 24)
+		| ((Elf32_Word)buf[1] << 16)
+		| ((Elf32_Word)buf[2] << 8)
+		| ((Elf32_Word)buf[3]);
+}
+
+static GElf_Addr get_glink_vma(struct ltelf *lte, GElf_Addr ppcgot,
+			       Elf_Data *plt_data)
+{
+	Elf_Scn *ppcgot_sec = NULL;
+	GElf_Shdr ppcgot_shdr;
+	if (ppcgot != 0
+	    && !get_section_covering(lte, ppcgot, &ppcgot_sec, &ppcgot_shdr))
+		// xxx should be the log out
+		fprintf(stderr,
+			"DT_PPC_GOT=%#" PRIx64 ", but no such section found.\n",
+			ppcgot);
+
+	if (ppcgot_sec != NULL) {
+		Elf_Data *data = loaddata(ppcgot_sec, &ppcgot_shdr);
+		if (data == NULL
+		    || data->d_size < 8 )
+			debug(1, "Couldn't read GOT data.");
+		else {
+			// where PPCGOT begins in .got
+			size_t offset = ppcgot - ppcgot_shdr.sh_addr;
+			GElf_Addr glink_vma = read32be(data, offset + 4);
+			if (glink_vma != 0) {
+				debug(1, "PPC GOT glink_vma address: %#" PRIx64,
+				      glink_vma);
+				return glink_vma;
+			}
+		}
+	}
+
+	if (plt_data != NULL) {
+		GElf_Addr glink_vma = read32be(plt_data, 0);
+		debug(1, ".plt glink_vma address: %#" PRIx64, glink_vma);
+		return glink_vma;
+	}
+
+	return 0;
+}
+
+void
+do_init_elf(struct ltelf *lte, const char *filename) {
+	int i;
+	GElf_Addr relplt_addr = 0;
+	size_t relplt_size = 0;
+
+	debug(DEBUG_FUNCTION, "do_init_elf(filename=%s)", filename);
+	debug(1, "Reading ELF from %s...", filename);
+
+	lte->fd = open(filename, O_RDONLY);
+	if (lte->fd == -1)
+		error(EXIT_FAILURE, errno, "Can't open \"%s\"", filename);
+
+#ifdef HAVE_ELF_C_READ_MMAP
+	lte->elf = elf_begin(lte->fd, ELF_C_READ_MMAP, NULL);
+#else
+	lte->elf = elf_begin(lte->fd, ELF_C_READ, NULL);
+#endif
+
+	if (lte->elf == NULL || elf_kind(lte->elf) != ELF_K_ELF)
+		error(EXIT_FAILURE, 0, "Can't open ELF file \"%s\"", filename);
+
+	if (gelf_getehdr(lte->elf, &lte->ehdr) == NULL)
+		error(EXIT_FAILURE, 0, "Can't read ELF header of \"%s\"",
+		      filename);
+
+	if (lte->ehdr.e_type != ET_EXEC && lte->ehdr.e_type != ET_DYN)
+		error(EXIT_FAILURE, 0,
+		      "\"%s\" is not an ELF executable nor shared library",
+		      filename);
+
+	if ((lte->ehdr.e_ident[EI_CLASS] != LT_ELFCLASS
+	     || lte->ehdr.e_machine != LT_ELF_MACHINE)
+#ifdef LT_ELF_MACHINE2
+	    && (lte->ehdr.e_ident[EI_CLASS] != LT_ELFCLASS2
+		|| lte->ehdr.e_machine != LT_ELF_MACHINE2)
+#endif
+#ifdef LT_ELF_MACHINE3
+	    && (lte->ehdr.e_ident[EI_CLASS] != LT_ELFCLASS3
+		|| lte->ehdr.e_machine != LT_ELF_MACHINE3)
+#endif
+	    )
+		error(EXIT_FAILURE, 0,
+		      "\"%s\" is ELF from incompatible architecture", filename);
+
+	Elf_Data *plt_data = NULL;
+	GElf_Addr ppcgot = 0;
+
+	for (i = 1; i < lte->ehdr.e_shnum; ++i) {
+		Elf_Scn *scn;
+		GElf_Shdr shdr;
+		const char *name;
+
+		scn = elf_getscn(lte->elf, i);
+		if (scn == NULL || gelf_getshdr(scn, &shdr) == NULL)
+			error(EXIT_FAILURE, 0,
+			      "Couldn't get section header from \"%s\"",
+			      filename);
+
+		name = elf_strptr(lte->elf, lte->ehdr.e_shstrndx, shdr.sh_name);
+		if (name == NULL)
+			error(EXIT_FAILURE, 0,
+			      "Couldn't get section header from \"%s\"",
+			      filename);
+
+		if (shdr.sh_type == SHT_SYMTAB) {
+			Elf_Data *data;
+
+			lte->symtab = elf_getdata(scn, NULL);
+			lte->symtab_count = shdr.sh_size / shdr.sh_entsize;
+			if ((lte->symtab == NULL
+			     || elf_getdata(scn, lte->symtab) != NULL)
+			    && opt_x != NULL)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get .symtab data from \"%s\"",
+				      filename);
+
+			scn = elf_getscn(lte->elf, shdr.sh_link);
+			if (scn == NULL || gelf_getshdr(scn, &shdr) == NULL)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get section header from \"%s\"",
+				      filename);
+
+			data = elf_getdata(scn, NULL);
+			if (data == NULL || elf_getdata(scn, data) != NULL
+			    || shdr.sh_size != data->d_size || data->d_off)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get .strtab data from \"%s\"",
+				      filename);
+
+			lte->strtab = data->d_buf;
+		} else if (shdr.sh_type == SHT_DYNSYM) {
+			Elf_Data *data;
+
+			lte->dynsym = elf_getdata(scn, NULL);
+			lte->dynsym_count = shdr.sh_size / shdr.sh_entsize;
+			if (lte->dynsym == NULL
+			    || elf_getdata(scn, lte->dynsym) != NULL)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get .dynsym data from \"%s\"",
+				      filename);
+
+			scn = elf_getscn(lte->elf, shdr.sh_link);
+			if (scn == NULL || gelf_getshdr(scn, &shdr) == NULL)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get section header from \"%s\"",
+				      filename);
+
+			data = elf_getdata(scn, NULL);
+			if (data == NULL || elf_getdata(scn, data) != NULL
+			    || shdr.sh_size != data->d_size || data->d_off)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get .dynstr data from \"%s\"",
+				      filename);
+
+			lte->dynstr = data->d_buf;
+		} else if (shdr.sh_type == SHT_DYNAMIC) {
+			Elf_Data *data;
+			size_t j;
+
+			lte->dyn_addr = shdr.sh_addr;
+			lte->dyn_sz = shdr.sh_size;
+
+			data = elf_getdata(scn, NULL);
+			if (data == NULL || elf_getdata(scn, data) != NULL)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get .dynamic data from \"%s\"",
+				      filename);
+
+			for (j = 0; j < shdr.sh_size / shdr.sh_entsize; ++j) {
+				GElf_Dyn dyn;
+
+				if (gelf_getdyn(data, j, &dyn) == NULL)
+					error(EXIT_FAILURE, 0,
+					      "Couldn't get .dynamic data from \"%s\"",
+					      filename);
+#ifdef __mips__
+/**
+  MIPS ABI Supplement:
+
+  DT_PLTGOT This member holds the address of the .got section.
+
+  DT_MIPS_SYMTABNO This member holds the number of entries in the
+  .dynsym section.
+
+  DT_MIPS_LOCAL_GOTNO This member holds the number of local global
+  offset table entries.
+
+  DT_MIPS_GOTSYM This member holds the index of the first dyamic
+  symbol table entry that corresponds to an entry in the gobal offset
+  table.
+
+ */
+				if(dyn.d_tag==DT_PLTGOT){
+					lte->pltgot_addr=dyn.d_un.d_ptr;
+				}
+				if(dyn.d_tag==DT_MIPS_LOCAL_GOTNO){
+					lte->mips_local_gotno=dyn.d_un.d_val;
+				}
+				if(dyn.d_tag==DT_MIPS_GOTSYM){
+					lte->mips_gotsym=dyn.d_un.d_val;
+				}
+#endif // __mips__
+				if (dyn.d_tag == DT_JMPREL)
+					relplt_addr = dyn.d_un.d_ptr;
+				else if (dyn.d_tag == DT_PLTRELSZ)
+					relplt_size = dyn.d_un.d_val;
+				else if (dyn.d_tag == DT_PPC_GOT) {
+					ppcgot = dyn.d_un.d_val;
+					debug(1, "ppcgot %#" PRIx64, ppcgot);
+				}
+			}
+		} else if (shdr.sh_type == SHT_HASH) {
+			Elf_Data *data;
+			size_t j;
+
+			lte->hash_type = SHT_HASH;
+
+			data = elf_getdata(scn, NULL);
+			if (data == NULL || elf_getdata(scn, data) != NULL
+			    || data->d_off || data->d_size != shdr.sh_size)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get .hash data from \"%s\"",
+				      filename);
+
+			if (shdr.sh_entsize == 4) {
+				/* Standard conforming ELF.  */
+				if (data->d_type != ELF_T_WORD)
+					error(EXIT_FAILURE, 0,
+					      "Couldn't get .hash data from \"%s\"",
+					      filename);
+				lte->hash = (Elf32_Word *) data->d_buf;
+			} else if (shdr.sh_entsize == 8) {
+				/* Alpha or s390x.  */
+				Elf32_Word *dst, *src;
+				size_t hash_count = data->d_size / 8;
+
+				lte->hash = (Elf32_Word *)
+				    malloc(hash_count * sizeof(Elf32_Word));
+				if (lte->hash == NULL)
+					error(EXIT_FAILURE, 0,
+					      "Couldn't convert .hash section from \"%s\"",
+					      filename);
+				lte->lte_flags |= LTE_HASH_MALLOCED;
+				dst = lte->hash;
+				src = (Elf32_Word *) data->d_buf;
+				if ((data->d_type == ELF_T_WORD
+				     && __BYTE_ORDER == __BIG_ENDIAN)
+				    || (data->d_type == ELF_T_XWORD
+					&& lte->ehdr.e_ident[EI_DATA] ==
+					ELFDATA2MSB))
+					++src;
+				for (j = 0; j < hash_count; ++j, src += 2)
+					*dst++ = *src;
+			} else
+				error(EXIT_FAILURE, 0,
+				      "Unknown .hash sh_entsize in \"%s\"",
+				      filename);
+		} else if (shdr.sh_type == SHT_GNU_HASH
+			   && lte->hash == NULL) {
+			Elf_Data *data;
+
+			lte->hash_type = SHT_GNU_HASH;
+
+			if (shdr.sh_entsize != 0
+			    && shdr.sh_entsize != 4) {
+				error(EXIT_FAILURE, 0,
+				      ".gnu.hash sh_entsize in \"%s\" "
+					"should be 4, but is %#" PRIx64,
+					filename, shdr.sh_entsize);
+			}
+
+			data = loaddata(scn, &shdr);
+			if (data == NULL)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get .gnu.hash data from \"%s\"",
+				      filename);
+
+			lte->hash = (Elf32_Word *) data->d_buf;
+		} else if (shdr.sh_type == SHT_PROGBITS
+			   || shdr.sh_type == SHT_NOBITS) {
+			if (strcmp(name, ".plt") == 0) {
+				lte->plt_addr = shdr.sh_addr;
+				lte->plt_size = shdr.sh_size;
+				if (shdr.sh_flags & SHF_EXECINSTR) {
+					lte->lte_flags |= LTE_PLT_EXECUTABLE;
+				}
+				if (lte->ehdr.e_machine == EM_PPC) {
+					plt_data = loaddata(scn, &shdr);
+					if (plt_data == NULL)
+						fprintf(stderr,
+							"Can't load .plt data\n");
+				}
+			}
+#ifdef ARCH_SUPPORTS_OPD
+			else if (strcmp(name, ".opd") == 0) {
+				lte->opd_addr = (GElf_Addr *) (long) shdr.sh_addr;
+				lte->opd_size = shdr.sh_size;
+				lte->opd = elf_rawdata(scn, NULL);
+			}
+#endif
+		}
+	}
+
+	if (lte->dynsym == NULL || lte->dynstr == NULL)
+		error(EXIT_FAILURE, 0,
+		      "Couldn't find .dynsym or .dynstr in \"%s\"", filename);
+
+	if (!relplt_addr || !lte->plt_addr) {
+		debug(1, "%s has no PLT relocations", filename);
+		lte->relplt = NULL;
+		lte->relplt_count = 0;
+	} else if (relplt_size == 0) {
+		debug(1, "%s has unknown PLT size", filename);
+		lte->relplt = NULL;
+		lte->relplt_count = 0;
+	} else {
+		if (lte->ehdr.e_machine == EM_PPC) {
+			GElf_Addr glink_vma
+				= get_glink_vma(lte, ppcgot, plt_data);
+
+			assert (relplt_size % 12 == 0);
+			size_t count = relplt_size / 12; // size of RELA entry
+			lte->plt_stub_vma = glink_vma
+				- (GElf_Addr)count * PPC_PLT_STUB_SIZE;
+			debug(1, "stub_vma is %#" PRIx64, lte->plt_stub_vma);
+		}
+
+		for (i = 1; i < lte->ehdr.e_shnum; ++i) {
+			Elf_Scn *scn;
+			GElf_Shdr shdr;
+
+			scn = elf_getscn(lte->elf, i);
+			if (scn == NULL || gelf_getshdr(scn, &shdr) == NULL)
+				error(EXIT_FAILURE, 0,
+				      "Couldn't get section header from \"%s\"",
+				      filename);
+			if (shdr.sh_addr == relplt_addr
+			    && shdr.sh_size == relplt_size) {
+				lte->relplt = elf_getdata(scn, NULL);
+				lte->relplt_count =
+				    shdr.sh_size / shdr.sh_entsize;
+				if (lte->relplt == NULL
+				    || elf_getdata(scn, lte->relplt) != NULL)
+					error(EXIT_FAILURE, 0,
+					      "Couldn't get .rel*.plt data from \"%s\"",
+					      filename);
+				break;
+			}
+		}
+
+		if (i == lte->ehdr.e_shnum)
+			error(EXIT_FAILURE, 0,
+			      "Couldn't find .rel*.plt section in \"%s\"",
+			      filename);
+
+		debug(1, "%s %zd PLT relocations", filename, lte->relplt_count);
+	}
+}
+
+void
+do_close_elf(struct ltelf *lte) {
+	debug(DEBUG_FUNCTION, "do_close_elf()");
+	if (lte->lte_flags & LTE_HASH_MALLOCED)
+		free((char *)lte->hash);
+	elf_end(lte->elf);
+	close(lte->fd);
+}
+
+void
+add_library_symbol(GElf_Addr addr, const char *name,
+		   struct library_symbol **library_symbolspp,
+		   enum toplt type_of_plt, int is_weak) {
+	struct library_symbol *s;
+
+	debug(DEBUG_FUNCTION, "add_library_symbol()");
+
+	s = malloc(sizeof(struct library_symbol) + strlen(name) + 1);
+	if (s == NULL)
+		error(EXIT_FAILURE, errno, "add_library_symbol failed");
+
+	s->needs_init = 1;
+	s->is_weak = is_weak;
+	s->plt_type = type_of_plt;
+	s->next = *library_symbolspp;
+	s->enter_addr = (void *)(uintptr_t) addr;
+	s->name = (char *)(s + 1);
+	strcpy(s->name, name);
+	*library_symbolspp = s;
+
+	debug(2, "addr: %p, symbol: \"%s\"", (void *)(uintptr_t) addr, name);
+}
+
+/* stolen from elfutils-0.123 */
+static unsigned long
+private_elf_gnu_hash(const char *name) {
+	unsigned long h = 5381;
+	const unsigned char *string = (const unsigned char *)name;
+	unsigned char c;
+	for (c = *string; c; c = *++string)
+		h = h * 33 + c;
+	return h & 0xffffffff;
+}
+
+static int
+symbol_matches(struct ltelf *lte, size_t lte_i, GElf_Sym *sym,
+	       size_t symidx, const char *name)
+{
+	GElf_Sym tmp_sym;
+	GElf_Sym *tmp;
+
+	tmp = (sym) ? (sym) : (&tmp_sym);
+
+	if (gelf_getsym(lte[lte_i].dynsym, symidx, tmp) == NULL)
+		error(EXIT_FAILURE, 0, "Couldn't get symbol from .dynsym");
+	else {
+		tmp->st_value += lte[lte_i].base_addr;
+		debug(2, "symbol found: %s, %zd, %#" PRIx64,
+		      name, lte_i, tmp->st_value);
+	}
+	return tmp->st_value != 0
+		&& tmp->st_shndx != SHN_UNDEF
+		&& strcmp(name, lte[lte_i].dynstr + tmp->st_name) == 0;
+}
+
+int
+in_load_libraries(const char *name, struct ltelf *lte, size_t count, GElf_Sym *sym) {
+	size_t i;
+	unsigned long hash;
+	unsigned long gnu_hash;
+
+	if (!count)
+		return 1;
+
+#ifdef ELF_HASH_TAKES_SIGNED_CHAR
+	hash = elf_hash(name);
+#else
+	hash = elf_hash((const unsigned char *)name);
+#endif
+	gnu_hash = private_elf_gnu_hash(name);
+
+	for (i = 0; i < count; ++i) {
+		if (lte[i].hash == NULL)
+			continue;
+
+		if (lte[i].hash_type == SHT_GNU_HASH) {
+			Elf32_Word * hashbase = lte[i].hash;
+			Elf32_Word nbuckets = *hashbase++;
+			Elf32_Word symbias = *hashbase++;
+			Elf32_Word bitmask_nwords = *hashbase++;
+			Elf32_Word * buckets;
+			Elf32_Word * chain_zero;
+			Elf32_Word bucket;
+
+			// +1 for skipped `shift'
+			hashbase += lte[i].ehdr.e_ident[EI_CLASS] * bitmask_nwords + 1;
+			buckets = hashbase;
+			hashbase += nbuckets;
+			chain_zero = hashbase - symbias;
+			bucket = buckets[gnu_hash % nbuckets];
+
+			if (bucket != 0) {
+				const Elf32_Word *hasharr = &chain_zero[bucket];
+				do
+					if ((*hasharr & ~1u) == (gnu_hash & ~1u)) {
+						int symidx = hasharr - chain_zero;
+						if (symbol_matches(lte, i,
+								   sym, symidx,
+								   name))
+							return 1;
+					}
+				while ((*hasharr++ & 1u) == 0);
+			}
+		} else {
+			Elf32_Word nbuckets, symndx;
+			Elf32_Word *buckets, *chain;
+			nbuckets = lte[i].hash[0];
+			buckets = &lte[i].hash[2];
+			chain = &lte[i].hash[2 + nbuckets];
+
+			for (symndx = buckets[hash % nbuckets];
+			     symndx != STN_UNDEF; symndx = chain[symndx])
+				if (symbol_matches(lte, i, sym, symndx, name))
+					return 1;
+		}
+	}
+	return 0;
+}
+
+static GElf_Addr
+opd2addr(struct ltelf *lte, GElf_Addr addr) {
+#ifdef ARCH_SUPPORTS_OPD
+	unsigned long base, offset;
+
+	if (!lte->opd)
+		return addr;
+
+	base = (unsigned long)lte->opd->d_buf;
+	offset = (unsigned long)addr - (unsigned long)lte->opd_addr;
+	if (offset > lte->opd_size)
+		error(EXIT_FAILURE, 0, "static plt not in .opd");
+
+	return *(GElf_Addr*)(base + offset);
+#else //!ARCH_SUPPORTS_OPD
+	return addr;
+#endif
+}
+
+struct library_symbol *
+read_elf(Process *proc) {
+	struct ltelf lte[MAX_LIBRARIES + 1];
+	size_t i;
+	struct opt_x_t *xptr;
+	struct library_symbol **lib_tail = NULL;
+	int exit_out = 0;
+	int count = 0;
+
+	debug(DEBUG_FUNCTION, "read_elf(file=%s)", proc->filename);
+
+	memset(lte, 0, sizeof(*lte));
+	library_symbols = NULL;
+	library_num = 0;
+	proc->libdl_hooked = 0;
+
+	elf_version(EV_CURRENT);
+
+	do_init_elf(lte, proc->filename);
+
+	memcpy(&main_lte, lte, sizeof(struct ltelf));
+
+	if (opt_p && opt_p->pid > 0) {
+		linkmap_init(proc, lte);
+		proc->libdl_hooked = 1;
+	}
+
+	proc->e_machine = lte->ehdr.e_machine;
+
+	for (i = 0; i < library_num; ++i) {
+		do_init_elf(&lte[i + 1], library[i]);
+	}
+
+	if (!options.no_plt) {
+#ifdef __mips__
+		// MIPS doesn't use the PLT and the GOT entries get changed
+		// on startup.
+		proc->need_to_reinitialize_breakpoints = 1;
+		for(i=lte->mips_gotsym; i<lte->dynsym_count;i++){
+			GElf_Sym sym;
+			const char *name;
+			GElf_Addr addr = arch_plt_sym_val(lte, i, 0);
+			if (gelf_getsym(lte->dynsym, i, &sym) == NULL){
+				error(EXIT_FAILURE, 0,
+						"Couldn't get relocation from \"%s\"",
+						proc->filename);
+			}
+			name=lte->dynstr+sym.st_name;
+			if(ELF64_ST_TYPE(sym.st_info) != STT_FUNC){
+				debug(2,"sym %s not a function",name);
+				continue;
+			}
+			add_library_symbol(addr, name, &library_symbols, 0,
+					ELF64_ST_BIND(sym.st_info) != 0);
+			if (!lib_tail)
+				lib_tail = &(library_symbols->next);
+		}
+#else
+		for (i = 0; i < lte->relplt_count; ++i) {
+			GElf_Rel rel;
+			GElf_Rela rela;
+			GElf_Sym sym;
+			GElf_Addr addr;
+			void *ret;
+			const char *name;
+
+			if (lte->relplt->d_type == ELF_T_REL) {
+				ret = gelf_getrel(lte->relplt, i, &rel);
+				rela.r_offset = rel.r_offset;
+				rela.r_info = rel.r_info;
+				rela.r_addend = 0;
+			} else
+				ret = gelf_getrela(lte->relplt, i, &rela);
+
+			if (ret == NULL
+					|| ELF64_R_SYM(rela.r_info) >= lte->dynsym_count
+					|| gelf_getsym(lte->dynsym, ELF64_R_SYM(rela.r_info),
+						&sym) == NULL)
+				error(EXIT_FAILURE, 0,
+						"Couldn't get relocation from \"%s\"",
+						proc->filename);
+
+#ifdef PLT_REINITALISATION_BP
+			if (!sym.st_value && PLTs_initialized_by_here)
+				proc->need_to_reinitialize_breakpoints = 1;
+#endif
+
+			name = lte->dynstr + sym.st_name;
+			count = library_num ? library_num+1 : 0;
+
+			if (in_load_libraries(name, lte, count, NULL)) {
+				enum toplt pltt;
+				if (sym.st_value == 0 && lte->plt_stub_vma != 0) {
+					pltt = LS_TOPLT_EXEC;
+					addr = lte->plt_stub_vma + PPC_PLT_STUB_SIZE * i;
+				}
+				else {
+					pltt = PLTS_ARE_EXECUTABLE(lte)
+						?  LS_TOPLT_EXEC : LS_TOPLT_POINT;
+					addr = arch_plt_sym_val(lte, i, &rela);
+				}
+
+				add_library_symbol(addr, name, &library_symbols, pltt,
+						ELF64_ST_BIND(sym.st_info) == STB_WEAK);
+				if (!lib_tail)
+					lib_tail = &(library_symbols->next);
+			}
+		}
+#endif // !__mips__
+#ifdef PLT_REINITALISATION_BP
+		struct opt_x_t *main_cheat;
+
+		if (proc->need_to_reinitialize_breakpoints) {
+			/* Add "PLTs_initialized_by_here" to opt_x list, if not
+				 already there. */
+			main_cheat = (struct opt_x_t *)malloc(sizeof(struct opt_x_t));
+			if (main_cheat == NULL)
+				error(EXIT_FAILURE, 0, "Couldn't allocate memory");
+			main_cheat->next = opt_x;
+			main_cheat->found = 0;
+			main_cheat->name = PLTs_initialized_by_here;
+
+			for (xptr = opt_x; xptr; xptr = xptr->next)
+				if (strcmp(xptr->name, PLTs_initialized_by_here) == 0
+						&& main_cheat) {
+					free(main_cheat);
+					main_cheat = NULL;
+					break;
+				}
+			if (main_cheat)
+				opt_x = main_cheat;
+		}
+#endif
+	} else {
+		lib_tail = &library_symbols;
+	}
+
+	for (i = 0; i < lte->symtab_count; ++i) {
+		GElf_Sym sym;
+		GElf_Addr addr;
+		const char *name;
+
+		if (gelf_getsym(lte->symtab, i, &sym) == NULL)
+			error(EXIT_FAILURE, 0,
+			      "Couldn't get symbol from \"%s\"",
+			      proc->filename);
+
+		name = lte->strtab + sym.st_name;
+		addr = sym.st_value;
+		if (!addr)
+			continue;
+
+		for (xptr = opt_x; xptr; xptr = xptr->next)
+			if (xptr->name && strcmp(xptr->name, name) == 0) {
+				/* FIXME: Should be able to use &library_symbols as above.  But
+				   when you do, none of the real library symbols cause breaks. */
+				add_library_symbol(opd2addr(lte, addr),
+						   name, lib_tail, LS_TOPLT_NONE, 0);
+				xptr->found = 1;
+				break;
+			}
+	}
+
+	unsigned found_count = 0;
+
+	for (xptr = opt_x; xptr; xptr = xptr->next) {
+		if (xptr->found)
+			continue;
+
+		GElf_Sym sym;
+		GElf_Addr addr;
+		if (in_load_libraries(xptr->name, lte, library_num+1, &sym)) {
+			debug(2, "found symbol %s @ %#" PRIx64 ", adding it.",
+					xptr->name, sym.st_value);
+			addr = sym.st_value;
+			if (ELF32_ST_TYPE (sym.st_info) == STT_FUNC) {
+				add_library_symbol(addr, xptr->name, lib_tail, LS_TOPLT_NONE, 0);
+				xptr->found = 1;
+				found_count++;
+			}
+		}
+		if (found_count == opt_x_cnt){
+			debug(2, "done, found everything: %d\n", found_count);
+			break;
+		}
+	}
+
+	for (xptr = opt_x; xptr; xptr = xptr->next)
+		if ( ! xptr->found) {
+			char *badthing = "WARNING";
+#ifdef PLT_REINITALISATION_BP
+			if (strcmp(xptr->name, PLTs_initialized_by_here) == 0) {
+				if (lte->ehdr.e_entry) {
+					add_library_symbol (
+						opd2addr (lte, lte->ehdr.e_entry),
+						PLTs_initialized_by_here,
+						lib_tail, 1, 0);
+					fprintf (stderr, "WARNING: Using e_ent"
+						 "ry from elf header (%p) for "
+						 "address of \"%s\"\n", (void*)
+						 (long) lte->ehdr.e_entry,
+						 PLTs_initialized_by_here);
+					continue;
+				}
+				badthing = "ERROR";
+				exit_out = 1;
+			}
+#endif
+			fprintf (stderr,
+				 "%s: Couldn't find symbol \"%s\" in file \"%s\" assuming it will be loaded by libdl!"
+				 "\n", badthing, xptr->name, proc->filename);
+		}
+	if (exit_out) {
+		exit (1);
+	}
+
+	for (i = 0; i < library_num + 1; ++i)
+		do_close_elf(&lte[i]);
+
+	return library_symbols;
+}

=== added file 'ltrace-elf.h'
--- ltrace-elf.h	1970-01-01 00:00:00 +0000
+++ ltrace-elf.h	2011-03-15 17:56:13 +0000
@@ -0,0 +1,63 @@
+#ifndef LTRACE_ELF_H
+#define LTRACE_ELF_H
+
+#include <gelf.h>
+#include <stdlib.h>
+
+struct ltelf {
+	int fd;
+	Elf *elf;
+	GElf_Ehdr ehdr;
+	Elf_Data *dynsym;
+	size_t dynsym_count;
+	const char *dynstr;
+	GElf_Addr plt_addr;
+	size_t plt_size;
+	Elf_Data *relplt;
+	size_t relplt_count;
+	Elf_Data *symtab;
+	const char *strtab;
+	size_t symtab_count;
+	Elf_Data *opd;
+	GElf_Addr *opd_addr;
+	size_t opd_size;
+	Elf32_Word *hash;
+	int hash_type;
+	int lte_flags;
+	GElf_Addr dyn_addr;
+	size_t dyn_sz;
+	GElf_Addr base_addr;
+#ifdef __mips__
+	size_t pltgot_addr;
+	size_t mips_local_gotno;
+	size_t mips_gotsym;
+#endif // __mips__
+	GElf_Addr plt_stub_vma;
+};
+
+#define ELF_MAX_SEGMENTS  50
+#define LTE_HASH_MALLOCED 1
+#define LTE_PLT_EXECUTABLE 2
+
+#define PLTS_ARE_EXECUTABLE(lte) ((lte->lte_flags & LTE_PLT_EXECUTABLE) != 0)
+
+extern size_t library_num;
+extern char *library[MAX_LIBRARIES];
+
+extern struct library_symbol *read_elf(Process *);
+
+extern GElf_Addr arch_plt_sym_val(struct ltelf *, size_t, GElf_Rela *);
+
+#ifndef SHT_GNU_HASH
+#define SHT_GNU_HASH	0x6ffffff6	/* GNU-style hash table. */
+#endif
+
+#if __WORDSIZE == 32
+#define PRI_ELF_ADDR		PRIx32
+#define GELF_ADDR_CAST(x)	(void *)(uint32_t)(x)
+#else
+#define PRI_ELF_ADDR		PRIx64
+#define GELF_ADDR_CAST(x)	(void *)(x)
+#endif
+
+#endif

=== modified file 'ltrace.1'
--- ltrace.1	2009-07-28 16:44:35 +0000
+++ ltrace.1	2011-03-15 17:56:13 +0000
@@ -6,7 +6,7 @@
 
 .SH SYNOPSIS
 .B ltrace
-.I "[-CfhiLrStttV] [-a column] [-A maxelts] [-D level] [-e expr] [-l filename] [-n nr] [-o filename] [-p pid] ... [-s strsize] [-u username] [-X extern] [-x extern] ... [--align=column] [--debug=level] [--demangle] [--help] [--indent=nr] [--library=filename] [--output=filename] [--version] [command [arg ...]]"
+.I "[-bCfghiLrStttV] [-a column] [-A maxelts] [-D level] [-e expr] [-l filename] [-n nr] [-o filename] [-p pid] ... [-s strsize] [-u username] [-w count] [-X extern] [-x extern] ... [--align=column] [--debug=level] [--demangle] [--help] [--indent=nr] [--library=filename] [--no-signals] [--output=filename] [--version] [--where=NR] [command [arg ...]]"
 
 .SH DESCRIPTION
 .B ltrace
@@ -23,11 +23,16 @@
 .SH OPTIONS
 .TP
 .I \-a, \-\-align column
-Align return values in a specific column (default column is 5/8 of screen width).
+Align return values in a specific
+.IR column
+(default column is 5/8 of screen width).
 .TP
 .I \-A maxelts
 Maximum number of array elements to print before suppressing the rest with an ellipsis ("...")
 .TP
+.I \-b, \-\-no-signals
+Disable printing of signals recieved by the traced process.
+.TP
 .I \-c
 Count time and calls for each library call and report a summary on program exit.
 .TP
@@ -82,6 +87,11 @@
 or clone(2) system calls.
 The new process is attached immediately.
 .TP
+.I \-g
+Do not place breakpoints on PLT entries. This option reduces
+the output of ltrace. This is commonly used to avoid tracing
+libc functions.
+.TP
 .I \-F
 Load an alternate config file. Normally, /etc/ltrace.conf and
 ~/.ltrace.conf will be read (the latter only if it exists).
@@ -153,6 +163,10 @@
 This option is only useful when running as root and enables the
 correct execution of setuid and/or setgid binaries.
 .TP
+.I \-w, --where NR
+Show backtrace of NR stack frames for each traced function. This option enabled
+only if libunwind support was enabled at compile time.
+.TP
 .I \-X extern
 Some architectures need to know where to set a breakpoint that will be hit
 after the dynamic linker has run.  If this flag is used, then the breakpoint
@@ -164,6 +178,8 @@
 .I \-x extern
 Trace the external function
 .IR extern .
+This option will search the symbol table and lib-dl loaded libraries when
+attempting to match the given symbol name.
 This option may be repeated.
 .TP
 .I \-V, \-\-version
@@ -179,9 +195,6 @@
 .LP
 It only works on Linux and in a small subset of architectures.
 .LP
-Only ELF32 binaries are supported.
-.LP
-Calls to dlopen()ed libraries will not be traced.
 .PP
 If you would like to report a bug, send a message to the mailing list
 ([e-mail]), or use the

=== removed file 'mkdist'
--- mkdist	2009-07-25 16:24:38 +0000
+++ mkdist	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-# Create ltrace-${version}.tar.gz from a GIT repository
-
-if [ ! -d .git -o ! -f libltrace.c ]
-then
-  echo "This must be called inside a ltrace GIT repository" 1>&2
-  exit 1
-fi
-
-VERSION=$( cat VERSION )
-
-echo Building ltrace-$VERSION.tar.gz ...
-rm -rf ltrace-$VERSION
-git clone ./ ltrace-$VERSION >/dev/null
-GZIP=-9 tar --exclude .git -zcf ltrace-$VERSION.tar.gz ltrace-$VERSION
-rm -rf ltrace-$VERSION
-echo Done.
-

=== modified file 'options.c'
--- options.c	2009-07-28 16:44:35 +0000
+++ options.c	2011-03-15 17:56:13 +0000
@@ -37,7 +37,7 @@
 };
 
 char *library[MAX_LIBRARIES];
-int library_num = 0;
+size_t library_num = 0;
 static char *progname;		/* Program name (`ltrace') */
 int opt_i = 0;			/* instruction pointer */
 int opt_r = 0;			/* print relative timestamp */
@@ -53,6 +53,7 @@
 
 /* List of global function names given to -x: */
 struct opt_x_t *opt_x = NULL;
+unsigned int opt_x_cnt = 0;
 
 /* List of filenames give to option -F: */
 struct opt_F_t *opt_F = NULL;	/* alternate configuration file(s) */
@@ -75,6 +76,7 @@
 		"Trace library calls of a given program.\n\n"
 		"  -a, --align=COLUMN  align return values in a secific column.\n"
 		"  -A ARRAYLEN         maximum number of array elements to print.\n"
+		"  -b, --no-signals    don't print signals.\n"
 		"  -c                  count time and calls, and report a summary on exit.\n"
 # ifdef USE_DEMANGLE
 		"  -C, --demangle      decode low-level symbol names into user-level names.\n"
@@ -84,6 +86,7 @@
 		"  -e expr             modify which events to trace.\n"
 		"  -f                  trace children (fork() and clone()).\n"
 		"  -F, --config=FILE   load alternate configuration file (may be repeated).\n"
+		"  -g, --no-plt        disable breakpoints on PLT entries.\n"
 		"  -h, --help          display this help and exit.\n"
 		"  -i                  print instruction pointer at time of library call.\n"
 		"  -l, --library=FILE  print library calls from this library only.\n"
@@ -98,6 +101,9 @@
 		"  -T                  show the time spent inside each call.\n"
 		"  -u USERNAME         run command with the userid, groupid of username.\n"
 		"  -V, --version       output version information and exit.\n"
+#if defined(HAVE_LIBUNWIND)
+		"  -w=NR, --where=NR   print backtrace showing NR stack frames at most.\n"
+#endif /* defined(HAVE_LIBUNWIND) */
 		"  -x NAME             treat the global NAME like a library subroutine.\n"
 #ifdef PLT_REINITALISATION_BP
 		"  -X NAME             same as -x; and PLT's will be initialized by here.\n"
@@ -179,6 +185,11 @@
 process_options(int argc, char **argv) {
 	progname = argv[0];
 	options.output = stderr;
+	options.no_plt = 0;
+	options.no_signals = 0;
+#if defined(HAVE_LIBUNWIND)
+	options.bt_depth = -1;
+#endif /* defined(HAVE_LIBUNWIND) */
 
 	guess_cols();
 
@@ -198,13 +209,22 @@
 			{"library", 1, 0, 'l'},
 			{"output", 1, 0, 'o'},
 			{"version", 0, 0, 'V'},
+			{"no-plt", 0, 0, 'g'},
+			{"no-signals", 0, 0, 'b'},
+#if defined(HAVE_LIBUNWIND)
+			{"where", 1, 0, 'w'},
+#endif /* defined(HAVE_LIBUNWIND) */
 			{0, 0, 0, 0}
 		};
-		c = getopt_long(argc, argv, "+cfhiLrStTV"
+		c = getopt_long(argc, argv, "+cfhiLrStTVgb"
 # ifdef USE_DEMANGLE
 				"C"
 # endif
+#if defined(HAVE_LIBUNWIND)
+				"a:A:D:e:F:l:n:o:p:s:u:x:X:w:", long_options,
+#else /* !defined(HAVE_LIBUNWIND) */
 				"a:A:D:e:F:l:n:o:p:s:u:x:X:", long_options,
+#endif
 				&option_index);
 		if (c == -1) {
 			break;
@@ -216,6 +236,9 @@
 		case 'A':
 			options.arraylen = atoi(optarg);
 			break;
+		case 'b':
+			options.no_signals = 1;
+			break;
 		case 'c':
 			options.summary++;
 			break;
@@ -283,6 +306,9 @@
 				opt_F = tmp;
 				break;
 			}
+		case 'g':
+			options.no_plt = 1;
+			break;
 		case 'h':
 			usage();
 			exit(0);
@@ -351,6 +377,12 @@
 					"This is free software; see the GNU General Public Licence\n"
 					"version 2 or later for copying conditions.  There is NO warranty.\n");
 			exit(0);
+			break;
+#if defined(HAVE_LIBUNWIND)
+		case 'w':
+			options.bt_depth = atoi(optarg);
+			break;
+#endif /* defined(HAVE_LIBUNWIND) */
 		case 'X':
 #ifdef PLT_REINITALISATION_BP
 			PLTs_initialized_by_here = optarg;
@@ -378,9 +410,11 @@
 					perror("ltrace: malloc");
 					exit(1);
 				}
+				opt_x_cnt++;
 				p->name = optarg;
 				p->found = 0;
 				p->next = opt_x;
+				p->hash = ~(0UL);
 				opt_x = p;
 				break;
 			}

=== modified file 'options.h'
--- options.h	2009-07-28 16:44:35 +0000
+++ options.h	2011-03-15 17:56:13 +0000
@@ -2,18 +2,23 @@
 #include <sys/types.h>
 
 struct options_t {
-	int align;    /* -a: default alignment column for results */
-	char * user;  /* -u: username to run command as */
-	int syscalls; /* -S: display system calls */
-	int libcalls; /* -L: display library calls */
-	int demangle; /* -C: demangle low-level names into user-level names */
-	int indent;   /* -n: indent trace output according to program flow */
-	FILE *output; /* output to a specific file */
-	int summary;  /* count time, calls, and report a summary on program exit */
-	int debug;    /* debug */
-	int arraylen; /* default maximum # of array elements printed */
-	int strlen;   /* default maximum # of bytes printed in strings */
-	int follow;   /* trace child processes */
+	int align;      /* -a: default alignment column for results */
+	char * user;    /* -u: username to run command as */
+	int syscalls;   /* -S: display system calls */
+	int libcalls;   /* -L: display library calls */
+	int demangle;   /* -C: demangle low-level names into user-level names */
+	int indent;     /* -n: indent trace output according to program flow */
+	FILE *output;   /* output to a specific file */
+	int summary;    /* count time, calls, and report a summary on program exit */
+	int debug;      /* debug */
+	size_t arraylen;   /* default maximum # of array elements printed */
+	size_t strlen;     /* default maximum # of bytes printed in strings */
+	int follow;     /* trace child processes */
+	int no_plt;     /* set bps on PLT entries */
+	int no_signals; /* don't print signals */
+#if defined(HAVE_LIBUNWIND)
+	int bt_depth;	 /* how may levels of stack frames to show */
+#endif /* defined(HAVE_LIBUNWIND) */
 };
 extern struct options_t options;
 
@@ -40,6 +45,7 @@
 struct opt_x_t {
 	char *name;
 	int found;
+	unsigned long hash;
 	struct opt_x_t *next;
 };
 
@@ -51,5 +57,6 @@
 extern struct opt_F_t *opt_F;	/* alternate configuration file(s) */
 
 extern struct opt_x_t *opt_x;	/* list of functions to break at */
+extern unsigned int opt_x_cnt;
 
 extern char **process_options(int argc, char **argv);

=== modified file 'output.c'
--- output.c	2009-07-28 16:44:35 +0000
+++ output.c	2011-03-15 17:56:13 +0000
@@ -164,7 +164,6 @@
 	}
 	if (current_proc) {
 		fprintf(options.output, " <unfinished ...>\n");
-		current_proc = 0;
 		current_column = 0;
 	}
 	current_proc = proc;
@@ -298,6 +297,28 @@
 			(int)current_time_spent.tv_usec);
 	}
 	fprintf(options.output, "\n");
+
+#if defined(HAVE_LIBUNWIND)
+	if (options.bt_depth > 0) {
+		unw_cursor_t cursor;
+		unw_word_t ip, sp;
+		int unwind_depth = options.bt_depth;
+		char fn_name[100];
+
+		unw_init_remote(&cursor, proc->unwind_as, proc->unwind_priv);
+		while (unwind_depth) {
+			unw_get_reg(&cursor, UNW_REG_IP, &ip);
+			unw_get_reg(&cursor, UNW_REG_SP, &sp);
+			unw_get_proc_name(&cursor, fn_name, 100, NULL);
+			fprintf(options.output, "\t\t\t%s (ip = 0x%lx)\n", fn_name, (long) ip);
+			if (unw_step(&cursor) <= 0)
+				break;
+			unwind_depth--;
+		}
+		fprintf(options.output, "\n");
+	}
+#endif /* defined(HAVE_LIBUNWIND) */
+
 	current_proc = 0;
 	current_column = 0;
 }

=== modified file 'proc.c'
--- proc.c	2009-07-28 16:44:35 +0000
+++ proc.c	2011-03-15 17:56:13 +0000
@@ -1,3 +1,10 @@
+#include "config.h"
+
+#if defined(HAVE_LIBUNWIND)
+#include <libunwind.h>
+#include <libunwind-ptrace.h>
+#endif /* defined(HAVE_LIBUNWIND) */
+
 #include <sys/types.h>
 #include <string.h>
 #include <stdio.h>
@@ -18,11 +25,21 @@
 	proc->breakpoints_enabled = -1;
 	if (pid) {
 		proc->pid = pid;
+#if defined(HAVE_LIBUNWIND)
+		proc->unwind_priv = _UPT_create(pid);
+	} else {
+		proc->unwind_priv = NULL;
+#endif /* defined(HAVE_LIBUNWIND) */
 	}
+
 	breakpoints_init(proc);
 
 	proc->next = list_of_processes;
 	list_of_processes = proc;
+
+#if defined(HAVE_LIBUNWIND)
+	proc->unwind_as = unw_create_addr_space(&_UPT_accessors, 0);
+#endif /* defined(HAVE_LIBUNWIND) */
 	return proc;
 }
 

=== added file 'sysdeps/Makefile.am'
--- sysdeps/Makefile.am	1970-01-01 00:00:00 +0000
+++ sysdeps/Makefile.am	2011-03-15 17:56:13 +0000
@@ -0,0 +1,11 @@
+DIST_SUBDIRS = \
+	linux-gnu
+
+SUBDIRS = \
+	$(HOST_OS)
+
+noinst_HEADERS = \
+	sysdep.h
+
+MAINTAINERCLEANFILES = \
+	Makefile.in

=== modified file 'sysdeps/README'
--- sysdeps/README	2009-07-28 16:44:35 +0000
+++ sysdeps/README	2011-03-15 17:56:13 +0000
@@ -30,3 +30,4 @@
 void trace_me(void);
 int trace_pid(pid_t pid);
 void untrace_pid(pid_t pid);
+void linkmap_init(Process *, struct ltelf *);

=== removed file 'sysdeps/linux-gnu/Makefile'
--- sysdeps/linux-gnu/Makefile	2009-07-28 16:44:35 +0000
+++ sysdeps/linux-gnu/Makefile	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-ARCH		:=	$(shell uname -m | sed \
-				-e s/i.86/i386/ \
-				-e s/sun4u/sparc64/ \
-				-e s/sparc64/sparc/ \
-				-e s/arm.*/arm/ \
-				-e s/sa110/arm/ \
-				-e s/ppc64/ppc/ \
-				-e s/s390x/s390/ \
-			)
-
-CPPFLAGS	+=	-I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
-
-OBJ		=	events.o trace.o proc.o breakpoint.o
-
-all:		sysdep.h signalent.h syscallent.h arch_syscallent.h signalent1.h syscallent1.h ../sysdep.o
-
-sysdep.h:	$(ARCH)/arch.h
-		cat $(ARCH)/arch.h > sysdep.h
-
-signalent.h:
-		cp $(ARCH)/signalent.h signalent.h
-signalent1.h:
-		if [ -f $(ARCH)/signalent1.h ]; then \
-			cp $(ARCH)/signalent1.h signalent1.h; \
-		else \
-			> signalent1.h; \
-		fi
-
-syscallent.h:
-		cp $(ARCH)/syscallent.h syscallent.h
-
-syscallent1.h:
-		if [ -f $(ARCH)/syscallent1.h ]; then \
-			cp $(ARCH)/syscallent1.h syscallent1.h; \
-		else \
-			> syscallent1.h; \
-		fi
-
-arch_syscallent.h:
-		if [ -f $(ARCH)/arch_syscallent.h ]; then \
-			cp $(ARCH)/arch_syscallent.h arch_syscallent.h; \
-		else \
-			> arch_syscallent.h; \
-		fi
-
-../sysdep.o:	os.o $(ARCH)/arch.o
-		$(CC) -nostdlib -r -o ../sysdep.o os.o $(ARCH)/arch.o
-
-os.o:		$(OBJ)
-		$(CC) -nostdlib -r -o os.o $(OBJ)
-
-$(ARCH)/arch.o:	dummy
-		$(MAKE) -C $(ARCH)
-
-clean:
-		$(MAKE) -C $(ARCH) clean
-		rm -f $(OBJ) sysdep.h signalent.h signalent1.h syscallent.h arch_syscallent.h
-		rm -f syscallent1.h os.o sysdep.o ../sysdep.o
-
-dummy:

=== added file 'sysdeps/linux-gnu/Makefile.am'
--- sysdeps/linux-gnu/Makefile.am	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/Makefile.am	2011-03-15 17:56:13 +0000
@@ -0,0 +1,40 @@
+DIST_SUBDIRS = \
+	alpha \
+	arm \
+	i386 \
+	ia64 \
+	m68k \
+	mipsel \
+	ppc \
+	s390 \
+	sparc \
+	x86_64
+
+SUBDIRS = \
+	$(HOST_CPU)
+
+noinst_LTLIBRARIES = \
+	../libos.la
+
+___libos_la_SOURCES = \
+	events.c \
+	trace.c \
+	proc.c \
+	breakpoint.c
+
+___libos_la_LIBADD = \
+	libcpu.la
+
+noinst_HEADERS = \
+	arch_syscallent.h \
+	signalent1.h \
+	syscallent1.h
+
+EXTRA_DIST = \
+	arch_mksyscallent \
+	mksignalent \
+	mksyscallent \
+	mksyscallent_s390
+
+MAINTAINERCLEANFILES = \
+	Makefile.in

=== removed file 'sysdeps/linux-gnu/alpha/Makefile'
--- sysdeps/linux-gnu/alpha/Makefile	2008-05-27 10:51:22 +0000
+++ sysdeps/linux-gnu/alpha/Makefile	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-OBJ	=	trace.o regs.o plt.o
-
-all:		arch.o
-
-arch.o:		$(OBJ)
-		$(CC) -nostdlib -r -o arch.o $(OBJ)
-
-clean:
-		$(RM) $(OBJ) arch.o
-

=== added file 'sysdeps/linux-gnu/alpha/Makefile.am'
--- sysdeps/linux-gnu/alpha/Makefile.am	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/alpha/Makefile.am	2011-03-15 17:56:13 +0000
@@ -0,0 +1,16 @@
+noinst_LTLIBRARIES = \
+	../libcpu.la
+
+___libcpu_la_SOURCES = \
+	plt.c \
+	regs.c \
+	trace.c
+
+noinst_HEADERS = \
+	arch.h \
+	ptrace.h \
+	signalent.h \
+	syscallent.h
+
+MAINTAINERCLEANFILES = \
+	Makefile.in

=== added file 'sysdeps/linux-gnu/arch_syscallent.h'
--- sysdeps/linux-gnu/arch_syscallent.h	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/arch_syscallent.h	2011-03-15 17:56:13 +0000
@@ -0,0 +1,1 @@
+/* This file is intentionally left blank */

=== removed file 'sysdeps/linux-gnu/arm/Makefile'
--- sysdeps/linux-gnu/arm/Makefile	2009-01-06 17:46:28 +0000
+++ sysdeps/linux-gnu/arm/Makefile	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-OBJ	=	trace.o regs.o plt.o breakpoint.o
-
-all:		arch.o
-
-arch.o:		$(OBJ) arch.h
-		$(CC) -nostdlib -r -o arch.o $(OBJ)
-
-clean:
-		$(RM) $(OBJ) arch.o
-

=== added file 'sysdeps/linux-gnu/arm/Makefile.am'
--- sysdeps/linux-gnu/arm/Makefile.am	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/arm/Makefile.am	2011-03-15 17:56:13 +0000
@@ -0,0 +1,18 @@
+noinst_LTLIBRARIES = \
+	../libcpu.la
+
+___libcpu_la_SOURCES = \
+	breakpoint.c \
+	plt.c \
+	regs.c \
+	trace.c
+
+noinst_HEADERS = \
+	arch.h \
+	arch_syscallent.h \
+	ptrace.h \
+	signalent.h \
+	syscallent.h
+
+MAINTAINERCLEANFILES = \
+	Makefile.in

=== modified file 'sysdeps/linux-gnu/arm/plt.c'
--- sysdeps/linux-gnu/arm/plt.c	2009-07-28 16:44:35 +0000
+++ sysdeps/linux-gnu/arm/plt.c	2011-03-15 17:56:13 +0000
@@ -1,9 +1,21 @@
 #include <gelf.h>
 #include "common.h"
 
+static int
+arch_plt_entry_has_stub(struct ltelf *lte, size_t off) {
+	uint16_t op = *(uint16_t *)((char *)lte->relplt->d_buf + off);
+	return op == 0x4778;
+}
+
 GElf_Addr
 arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela) {
-	return lte->plt_addr + 20 + ndx * 12;
+	size_t start = lte->relplt->d_size + 12;
+	size_t off = start + 20, i;
+	for (i = 0; i < ndx; i++)
+		off += arch_plt_entry_has_stub(lte, off) ? 16 : 12;
+	if (arch_plt_entry_has_stub(lte, off))
+		off += 4;
+	return lte->plt_addr + off - start;
 }
 
 void *

=== modified file 'sysdeps/linux-gnu/arm/regs.c'
--- sysdeps/linux-gnu/arm/regs.c	2009-07-28 16:44:35 +0000
+++ sysdeps/linux-gnu/arm/regs.c	2011-03-15 17:56:13 +0000
@@ -47,5 +47,6 @@
 
 void
 set_return_addr(Process *proc, void *addr) {
-	ptrace(PTRACE_POKEUSER, proc->pid, off_lr, addr);
+	long iaddr = (int)addr | proc->thumb_mode;
+	ptrace(PTRACE_POKEUSER, proc->pid, off_lr, (void *)iaddr);
 }

=== modified file 'sysdeps/linux-gnu/arm/trace.c'
--- sysdeps/linux-gnu/arm/trace.c	2010-10-01 16:06:14 +0000
+++ sysdeps/linux-gnu/arm/trace.c	2011-03-15 17:56:13 +0000
@@ -46,7 +46,7 @@
 		/* get the user's pc (plus 8) */
 		int pc = ptrace(PTRACE_PEEKUSER, proc->pid, off_pc, 0);
 		/* fetch the SWI instruction */
-		int insn = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 4, 0);
+		unsigned insn = ptrace(PTRACE_PEEKTEXT, proc->pid, pc - 4, 0);
 		int ip = ptrace(PTRACE_PEEKUSER, proc->pid, off_ip, 0);
 
 		if (insn == 0xef000000 || insn == 0x0f000000
@@ -63,7 +63,7 @@
 			 * PC does not point to the instruction just after the
 			 * "swi" one. */
 			output_line(proc, "unexpected instruction 0x%x at %p", insn, pc - 4);
-			return -1;
+			return 0;
 		}
 		if ((*sysnum & 0xf0000) == 0xf0000) {
 			/* arch-specific syscall */

=== added directory 'sysdeps/linux-gnu/cris'
=== added file 'sysdeps/linux-gnu/cris/Makefile'
--- sysdeps/linux-gnu/cris/Makefile	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/cris/Makefile	2011-03-15 17:56:13 +0000
@@ -0,0 +1,10 @@
+OBJ	=	trace.o regs.o plt.o
+
+all:		arch.o
+
+arch.o:		$(OBJ)
+		$(CC) -nostdlib -r -o arch.o $(OBJ)
+
+clean:
+		$(RM) $(OBJ) arch.o
+

=== added file 'sysdeps/linux-gnu/cris/arch.h'
--- sysdeps/linux-gnu/cris/arch.h	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/cris/arch.h	2011-03-15 17:56:13 +0000
@@ -0,0 +1,6 @@
+#define BREAKPOINT_VALUE { 0x38, 0xe9 }
+#define BREAKPOINT_LENGTH 2
+#define DECR_PC_AFTER_BREAK 0
+
+#define LT_ELFCLASS	ELFCLASS32
+#define LT_ELF_MACHINE	EM_CRIS

=== added file 'sysdeps/linux-gnu/cris/plt.c'
--- sysdeps/linux-gnu/cris/plt.c	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/cris/plt.c	2011-03-15 17:56:13 +0000
@@ -0,0 +1,12 @@
+#include <gelf.h>
+#include "common.h"
+
+GElf_Addr arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela)
+{
+	return lte->plt_addr + 0x20 + (ndx * 26);
+}
+
+void *sym2addr(Process *proc, struct library_symbol *sym)
+{
+	return sym->enter_addr;
+}

=== added file 'sysdeps/linux-gnu/cris/ptrace.h'
--- sysdeps/linux-gnu/cris/ptrace.h	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/cris/ptrace.h	2011-03-15 17:56:13 +0000
@@ -0,0 +1,1 @@
+#include <sys/ptrace.h>

=== added file 'sysdeps/linux-gnu/cris/regs.c'
--- sysdeps/linux-gnu/cris/regs.c	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/cris/regs.c	2011-03-15 17:56:13 +0000
@@ -0,0 +1,37 @@
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <asm/ptrace.h>
+
+#include "common.h"
+
+#if (!defined(PTRACE_PEEKUSER) && defined(PTRACE_PEEKUSR))
+# define PTRACE_PEEKUSER PTRACE_PEEKUSR
+#endif
+
+#if (!defined(PTRACE_POKEUSER) && defined(PTRACE_POKEUSR))
+# define PTRACE_POKEUSER PTRACE_POKEUSR
+#endif
+
+void *get_instruction_pointer(Process *proc)
+{
+	return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, 4 * PT_PPC, 0);
+}
+
+void set_instruction_pointer(Process *proc, void *addr)
+{
+	ptrace(PTRACE_POKEUSER, proc->pid, 4 * PT_PPC, addr);
+}
+
+void *get_stack_pointer(Process *proc)
+{
+	return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, 4 * PT_USP, 0);
+}
+
+void *get_return_addr(Process *proc, void *stack_pointer)
+{
+	return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, 4 * PT_SRP, 0);
+}

=== added file 'sysdeps/linux-gnu/cris/signalent.h'
--- sysdeps/linux-gnu/cris/signalent.h	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/cris/signalent.h	2011-03-15 17:56:13 +0000
@@ -0,0 +1,32 @@
+    "SIG_0",			/* 0 */
+    "SIGHUP",			/* 1 */
+    "SIGINT",			/* 2 */
+    "SIGQUIT",			/* 3 */
+    "SIGILL",			/* 4 */
+    "SIGTRAP",			/* 5 */
+    "SIGABRT",			/* 6 */
+    "SIGBUS",			/* 7 */
+    "SIGFPE",			/* 8 */
+    "SIGKILL",			/* 9 */
+    "SIGUSR1",			/* 10 */
+    "SIGSEGV",			/* 11 */
+    "SIGUSR2",			/* 12 */
+    "SIGPIPE",			/* 13 */
+    "SIGALRM",			/* 14 */
+    "SIGTERM",			/* 15 */
+    "SIGSTKFLT",		/* 16 */
+    "SIGCHLD",			/* 17 */
+    "SIGCONT",			/* 18 */
+    "SIGSTOP",			/* 19 */
+    "SIGTSTP",			/* 20 */
+    "SIGTTIN",			/* 21 */
+    "SIGTTOU",			/* 22 */
+    "SIGURG",			/* 23 */
+    "SIGXCPU",			/* 24 */
+    "SIGXFSZ",			/* 25 */
+    "SIGVTALRM",		/* 26 */
+    "SIGPROF",			/* 27 */
+    "SIGWINCH",			/* 28 */
+    "SIGIO",			/* 29 */
+    "SIGPWR",			/* 30 */
+    "SIGSYS",			/* 31 */

=== added file 'sysdeps/linux-gnu/cris/syscallent.h'
--- sysdeps/linux-gnu/cris/syscallent.h	1970-01-01 00:00:00 +0000
+++ sysdeps/linux-gnu/cris/syscallent.h	2011-03-15 17:56:13 +0000
@@ -0,0 +1,325 @@
+"0",				/* 0 */
+ "exit",
+"fork",
+"read",
+"write",
+"open",
+"close",
+"waitpid",
+"creat",
+"link",
+"unlink",
+"execve",
+"chdir",
+"time",
+"mknod",
+"chmod",
+"lchown",
+"break",
+"oldstat",
+"lseek",
+"getpid",
+"mount",
+"umount",
+"setuid",
+"getuid",
+"stime",
+"ptrace",
+"alarm",
+"oldfstat",
+"pause",
+"utime",
+"stty",
+"gtty",
+"access",
+"nice",
+"ftime",
+"sync",
+"kill",
+"rename",
+"mkdir",
+"rmdir",
+"dup",
+"pipe",
+"times",
+"prof",
+"brk",
+"setgid",
+"getgid",
+"signal",
+"geteuid",
+"getegid",
+"acct",
+"umount2",
+"lock",
+"ioctl",
+"fcntl",
+"mpx",
+"setpgid",
+"ulimit",
+"oldolduname",
+"umask",
+"chroot",
+"ustat",
+"dup2",
+"getppid",
+"getpgrp",
+"setsid",
+"sigaction",
+"sgetmask",
+"ssetmask",
+"setreuid",
+"setregid",
+"sigsuspend",
+"sigpending",
+"sethostname",
+"setrlimit",
+"getrlimit",
+"getrusage",
+"gettimeofday",
+"settimeofday",
+"getgroups",
+"setgroups",
+"select",
+"symlink",
+"oldlstat",
+"readlink",
+"uselib",
+"swapon",
+"reboot",
+"readdir",
+"mmap",
+"munmap",
+"truncate",
+"ftruncate",
+"fchmod",
+"fchown",
+"getpriority",
+"setpriority",
+"profil",
+"statfs",
+"fstatfs",
+"ioperm",
+"socketcall",
+"syslog",
+"setitimer",
+"getitimer",
+"stat",
+"lstat",
+"fstat",
+"olduname",
+"iopl",
+"vhangup",
+"idle",
+"vm86",
+"wait4",
+"swapoff",
+"sysinfo",
+"ipc",
+"fsync",
+"sigreturn",
+"clone",
+"setdomainname",
+"uname",
+"modify_ldt",
+"adjtimex",
+"mprotect",
+"sigprocmask",
+"create_module",
+"init_module",
+"delete_module",
+"get_kernel_syms",
+"quotactl",
+"getpgid",
+"fchdir",
+"bdflush",
+"sysfs",
+"personality",
+"afs_syscall",
+"setfsuid",
+"setfsgid",
+"_llseek",
+"getdents",
+"_newselect",
+"flock",
+"msync",
+"readv",
+"writev",
+"getsid",
+"fdatasync",
+"_sysctl",
+"mlock",
+"munlock",
+"mlockall",
+"munlockall",
+"sched_setparam",
+"sched_getparam",
+"sched_setscheduler",
+"sched_getscheduler",
+"sched_yield",
+"sched_get_priority_max",
+"sched_get_priority_min",
+"sched_rr_get_interval",
+"nanosleep",
+"mremap",
+"setresuid",
+"getresuid",
+"invalid",
+"query_module",
+"poll",
+"nfsservctl",
+"setresgid",
+"getresgid",
+"prctl",
+"rt_sigreturn",
+"rt_sigaction",
+"rt_sigprocmask",
+"rt_sigpending",
+"rt_sigtimedwait",
+"rt_sigqueueinfo",
+"rt_sigsuspend",
+"pread64",
+"pwrite64",
+"chown",
+"getcwd",
+"capget",
+"capset",
+"sigaltstack",
+"sendfile",
+"getpmsg",
+"putpmsg",
+"vfork",
+"ugetrlimit",
+"mmap2",
+"truncate64",
+"ftruncate64",
+"stat64",
+"lstat64",
+"fstat64",
+"lchown32",
+"getuid32",
+"getgid32",
+"geteuid32",
+"getegid32",
+"setreuid32",
+"setregid32",
+"getgroups32",
+"setgroups32",
+"fchown32",
+"setresuid32",
+"getresuid32",
+"setresgid32",
+"getresgid32",
+"chown32",
+"setuid32",
+"setgid32",
+"setfsuid32",
+"setfsgid32",
+"pivot_root",
+"mincore",
+"madvise",
+"getdents64",
+"fcntl64",
+"invalid",
+"invalid",
+"gettid",
+"readahead",
+"setxattr",
+"lsetxattr",
+"fsetxattr",
+"getxattr",
+"lgetxattr",
+"fgetxattr",
+"listxattr",
+"llistxattr",
+"flistxattr",
+"removexattr",
+"lremovexattr",
+"fremovexattr",
+"tkill",
+"sendfile64",
+"futex",
+"sched_setaffinity",
+"sched_getaffinity",
+"set_thread_area",
+"get_thread_area",
+"io_setup",
+"io_destroy",
+"io_getevents",
+"io_submit",
+"io_cancel",
+"fadvise64",
+"invalid",
+"exit_group",
+"lookup_dcookie",
+"epoll_create",
+"epoll_ctl",
+"epoll_wait",
+"remap_file_pages",
+"set_tid_address",
+"timer_create",
+"timer_settime",