Merge commit 'origin/master' into dwarf

Conflicts:
	libdw/Makefile.am

3 files changed, 20 insertions, 23 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 5bae5093..2d72ee39 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -104,6 +104,12 @@
 	* run-dwarfcmp-self.sh: New file.
 	* Makefile.am (TESTS, EXTRA_DIST) Add it.
 
+2010-02-15  Roland McGrath  <[email protected]>
+
+	* Makefile.am: Use config/eu.am for common stuff.
+
+	* asm-tst9.c (main): Rename local to avoid shadowing another local.
+
 2009-07-22  Roland McGrath  <[email protected]>
 
 	* addrcfi.c: Update dwarf_frame_{cfa,register} calling convention.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 174fcce4..c7ce6d50 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 ##
-## Copyright (C) 1996-2009 Red Hat, Inc.
+## Copyright (C) 1996-2010 Red Hat, Inc.
 ## This file is part of Red Hat elfutils.
 ##
 ## Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -24,28 +24,22 @@
 ## Network licensing program, please visit www.openinventionnetwork.com
 ## <http://www.openinventionnetwork.com>.
 ##
-DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE
+include $(top_srcdir)/config/eu.am
 if MUDFLAP
-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\
-	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
 BUILD_RPATH = \$$ORIGIN/../backends
 else
-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \
-	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)
 BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf
 endif
 
-AM_CXXFLAGS = $(AM_CFLAGS:gnu99=gnu++0x)
-
 AM_LDFLAGS =
 
 if !STANDALONE
-INCLUDES = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
-	   -I$(top_srcdir)/libdwfl \
-	   -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \
-	   -I$(top_srcdir)/lib -I..
+INCLUDES += -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \
+	    -I$(top_srcdir)/libdwfl \
+	    -I$(top_srcdir)/libebl -I$(top_srcdir)/libelf \
+	    -I$(top_srcdir)/lib -I..
 AM_LDFLAGS += -Wl,-rpath-link,../libasm:../libdw:../libelf
-endif !STANDALONE
+endif
 
 if TESTS_RPATH
 AM_LDFLAGS += -Wl,-rpath,$(BUILT_RPATH)
@@ -170,7 +164,6 @@ endif !STANDALONE
 
 if MUDFLAP
 static_build = yes
-libmudflap = -lmudflap
 endif
 
 if STANDALONE
@@ -251,11 +244,9 @@ dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
 dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
 dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
 sha1_tst_LDADD = $(libeu) $(libmudflap)
-dwarf_getmacros_LDADD = $(libdw)
+dwarf_getmacros_LDADD = $(libdw) $(libmudflap)
 addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
 
-CLEANFILES = xxx *.gcno *.gcda *gconv
-
 if GCOV
 check: check-am coverage
 .PHONY: coverage
diff --git a/tests/asm-tst9.c b/tests/asm-tst9.c
index 1797e48c..ad252759 100644
--- a/tests/asm-tst9.c
+++ b/tests/asm-tst9.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2005 Red Hat, Inc.
+/* Copyright (C) 2002-2010 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <[email protected]>, 2002.
 
@@ -211,19 +211,19 @@ main (void)
 
   for (cnt = 1; cnt < 3; ++cnt)
     {
-      Elf_Scn *scn;
+      Elf_Scn *escn;
       GElf_Shdr shdr_mem;
       GElf_Shdr *shdr;
 
-      scn = elf_getscn (elf, cnt);
-      if (scn == NULL)
+      escn = elf_getscn (elf, cnt);
+      if (escn == NULL)
 	{
 	  printf ("cannot get section %Zd: %s\n", cnt, elf_errmsg (-1));
 	  result = 1;
 	  continue;
 	}
 
-      shdr = gelf_getshdr (scn, &shdr_mem);
+      shdr = gelf_getshdr (escn, &shdr_mem);
       if (shdr == NULL)
 	{
 	  printf ("cannot get section header for section %Zd: %s\n",
@@ -303,7 +303,7 @@ main (void)
 
       if (cnt == 1)
 	{
-	  Elf_Data *data = elf_getdata (scn, NULL);
+	  Elf_Data *data = elf_getdata (escn, NULL);
 
 	  if (data == NULL)
 	    {