Cleanup after .disasm branch merge.

7 files changed, 24 insertions, 10 deletions

diff --git a/backends/Makefile.am b/backends/Makefile.am
index 28e55f6e..ef21717c 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -72,7 +72,8 @@ 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
+# XXX Not yet
+# 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)
 
diff --git a/backends/x86_64_init.c b/backends/x86_64_init.c
index c2d3de12..8524b771 100644
--- a/backends/x86_64_init.c
+++ b/backends/x86_64_init.c
@@ -54,7 +54,8 @@ x86_64_init (elf, machine, eh, ehlen)
   HOOK (eh, return_value_location);
   HOOK (eh, register_info);
   HOOK (eh, auxv_info);
-  HOOK (eh, disasm);
+  // XXX Not yet.
+  // HOOK (eh, disasm);
 
   return MODVERSION;
 }
diff --git a/config/ChangeLog b/config/ChangeLog
index e61bac2c..9d754684 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-02  Ulrich Drepper  <drepper@redhat.com>
+
+	* elfutils.spec.in: Changes for disasm branch merge.
+
 2007-08-08  Roland McGrath  <roland@redhat.com>
 
 	* elfutils.spec.in (License): Canonicalize.
diff --git a/config/elfutils.spec.in b/config/elfutils.spec.in
index 4f8f3cf7..f48c3983 100644
--- a/config/elfutils.spec.in
+++ b/config/elfutils.spec.in
@@ -13,7 +13,8 @@ Requires: glibc >= 2.3.1-2
 # ExcludeArch: xxx
 
 BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: gcc >= 3.4
+BuildRequires: gcc >= 4.1.2-33
+BuildRequires: glibc >= 2.7
 BuildRequires: bison >= 1.875
 BuildRequires: flex >= 2.5.4a
 BuildRequires: bzip2
@@ -104,8 +105,6 @@ chmod +x ${RPM_BUILD_ROOT}%{_prefix}/%{_lib}/elfutils/lib*.so*
 { cd ${RPM_BUILD_ROOT}
   rm -f .%{_bindir}/eu-ld
   rm -f .%{_includedir}/elfutils/libasm.h
-  rm -f .%{_libdir}/libasm-%{version}.so
-  rm -f .%{_libdir}/libasm.so.*
   rm -f .%{_libdir}/libasm.so
   rm -f .%{_libdir}/libasm.a
 }
@@ -140,10 +139,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/eu-objdump
 %{_bindir}/eu-ar
 %{_bindir}/eu-unstrip
+%{_bindir}/eu-make-debug-archive
 #%{_bindir}/eu-ld
-#%{_libdir}/libasm-%{version}.so
+%{_libdir}/libasm-%{version}.so
 %{_libdir}/libdw-%{version}.so
-#%{_libdir}/libasm.so.*
+%{_libdir}/libasm.so.*
 %{_libdir}/libdw.so.*
 %dir %{_libdir}/elfutils
 %{_libdir}/elfutils/lib*.so
@@ -153,6 +153,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/dwarf.h
 %dir %{_includedir}/elfutils
 %{_includedir}/elfutils/elf-knowledge.h
+#%{_includedir}/elfutils/libasm.h
 %{_includedir}/elfutils/libebl.h
 %{_includedir}/elfutils/libdw.h
 %{_includedir}/elfutils/libdwfl.h
diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am
index c511408d..a11f0209 100644
--- a/libcpu/Makefile.am
+++ b/libcpu/Makefile.am
@@ -30,8 +30,9 @@ AM_CFLAGS = -fmudflap
 else
 AM_CFLAGS =
 endif
-AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -std=gnu99 -fpic \
-	     $($(*F)_CFLAGS)
+AM_CFLAGS += -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fpic \
+	     $($(*F)_CFLAGS) \
+	     $(if $($(*F)_no_Werror),,-Werror)
 INCLUDES = -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../libelf \
 	   -I$(srcdir)/../libebl -I$(srcdir)/../libdw -I$(srcdir)/../libasm
 LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) -P$(<F:lex.l=)
@@ -65,6 +66,8 @@ i386.mnemonics x86_64.mnemonics: %.mnemonics: $(srcdir)/defs/%
 	| sed '1,/^%%/d;/^#/d;/^[[:space:]]*$$/d;s/[^:]*:\([^[:space:]]*\).*/MNE(\1)/;s/{[^}]*}//g;/INVALID/d' \
 	| sort -u > $@
 
+i386_lex_no_Werror = yes
+
 libeu = ../lib/libeu.a
 
 i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 2c7ed914..c2a3d48a 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-01  Ulrich Drepper  <drepper@redhat.com>
 
+	* line2addr.c: Use %m modifier instead of %a to appease gcc.
+
+2008-01-01  Ulrich Drepper  <drepper@redhat.com>
+
 	* testfile44.expect.bz2: New tests.
 	* testfile44.expect.bz2: Adjust.
 
diff --git a/tests/line2addr.c b/tests/line2addr.c
index 1180062c..5630da3c 100644
--- a/tests/line2addr.c
+++ b/tests/line2addr.c
@@ -132,7 +132,7 @@ main (int argc, char *argv[])
     {
       struct args a = { .arg = argv[cnt] };
 
-      switch (sscanf (a.arg, "%a[^:]:%d", &a.file, &a.line))
+      switch (sscanf (a.arg, "%m[^:]:%d", &a.file, &a.line))
 	{
 	default:
 	case 0: