propagate from branch 'com.redhat.elfutils.disasm' (head d15b4eb794e81e477f9896fe82a74cb5ecf4514c)

            to branch 'com.redhat.elfutils' (head eaacbf01f8cc89d043ec6eca9b5e35cb5c4cde06)

4 files changed, 25 insertions, 11 deletions

diff --git a/backends/ChangeLog b/backends/ChangeLog
index 97cddd23..3e35ef26 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -42,6 +42,10 @@
 	* sparc_retval.c: Likewise.
 	* x86_64_retval.c: Likewise.
 
+2007-10-31  Ulrich Drepper  <[email protected]>
+
+	* Makefile.am: More dependencies for the libebl_* libraries.
+
 2007-08-23  Roland McGrath  <[email protected]>
 
 	* x86_64_regs.c (x86_64_register_info): Put %rflags in "integer" set.
diff --git a/backends/Makefile.am b/backends/Makefile.am
index 4174f8e3..28e55f6e 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 ##
-## Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Red Hat, Inc.
+## Copyright (C) 2000-2006, 2007 Red Hat, Inc.
 ## This file is part of Red Hat elfutils.
 ##
 ## Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@ AM_CFLAGS =
 endif
 AM_CFLAGS += -fpic -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 \
 	     -std=gnu99
-INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \
+INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl -I$(top_srcdir)/libasm \
 	   -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \
 	   -I$(top_srcdir)/lib -I..
 
@@ -59,18 +59,10 @@ endif
 
 textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
 
-libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw)
-	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
-		-Wl,--version-script,$(word 2,$^) \
-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
-	$(textrel_check)
-
-libebl_%.map: Makefile
-	echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' > $@
-
 
 i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c \
 	    i386_retval.c i386_regs.c i386_auxv.c
+cpu_i386 = ../libcpu/libcpu_i386.a
 libebl_i386_pic_a_SOURCES = $(i386_SRCS)
 am_libebl_i386_pic_a_OBJECTS = $(i386_SRCS:.c=.os)
 
@@ -80,6 +72,7 @@ am_libebl_sh_pic_a_OBJECTS = $(sh_SRCS:.c=.os)
 
 x86_64_SRCS = x86_64_init.c x86_64_symbol.c x86_64_corenote.c \
 	      x86_64_retval.c x86_64_regs.c i386_auxv.c
+cpu_x86_64 = ../libcpu/libcpu_x86_64.a
 libebl_x86_64_pic_a_SOURCES = $(x86_64_SRCS)
 am_libebl_x86_64_pic_a_OBJECTS = $(x86_64_SRCS:.c=.os)
 
@@ -116,6 +109,21 @@ libebl_s390_pic_a_SOURCES = $(s390_SRCS)
 am_libebl_s390_pic_a_OBJECTS = $(s390_SRCS:.c=.os)
 
 
+libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw) \
+	     $(cpu_$(@:libebl_%.so=%)
+	$(LINK) -shared -o $@ -Wl,--whole-archive,$<\
+		$(cpu_$(@:libebl_%.so=%)) -Wl,--no-whole-archive \
+		-Wl,--version-script,$(word 2,$^) \
+		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap)
+	$(textrel_check)
+
+# XXX Should not be needed...
+libebl_i386.so: $(cpu_i386)
+libebl_x86_64.so: $(cpu_x86_64)
+
+libebl_%.map: Makefile
+	echo 'ELFUTILS_$(PACKAGE_VERSION) { global: $*_init; local: *; };' > $@
+
 %.os: %.c
 	if $(COMPILE) -c -o $@ -fpic -DPIC -DSHARED -MT $@ -MD -MP \
 	  -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \
diff --git a/backends/i386_init.c b/backends/i386_init.c
index f25e1eb9..bf6c130c 100644
--- a/backends/i386_init.c
+++ b/backends/i386_init.c
@@ -57,6 +57,7 @@ i386_init (elf, machine, eh, ehlen)
   HOOK (eh, return_value_location);
   HOOK (eh, register_info);
   HOOK (eh, auxv_info);
+  HOOK (eh, disasm);
 
   return MODVERSION;
 }
diff --git a/backends/x86_64_init.c b/backends/x86_64_init.c
index b1764832..c2d3de12 100644
--- a/backends/x86_64_init.c
+++ b/backends/x86_64_init.c
@@ -54,6 +54,7 @@ x86_64_init (elf, machine, eh, ehlen)
   HOOK (eh, return_value_location);
   HOOK (eh, register_info);
   HOOK (eh, auxv_info);
+  HOOK (eh, disasm);
 
   return MODVERSION;
 }