2005-12-07 Roland McGrath <roland@redhat.com>

	* ecp.c (main): Use elf_end to clean up.

diff --git a/NEWS b/NEWS
index 4c46203..f8b7b62 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,3 @@
-Version 0.119:
-
-bug fixes
-
 Version 0.118:
 
 elflint: more tests.

diff --git a/backends/ChangeLog b/backends/ChangeLog
index 2c05737..defd725 100644 (file)
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,7 +1,3 @@
-2005-12-10  Ulrich Drepper
-
-       * common-reloc.c (R_NAME): Generate string correctly.
-
 2005-12-05  Roland McGrath  <roland@redhat.com>
 
        * i386_regs.c (i386_register_name): Use a table for the first 8 regs.

diff --git a/backends/common-reloc.c b/backends/common-reloc.c
index b180537..0575e13 100644 (file)
--- a/backends/common-reloc.c
+++ b/backends/common-reloc.c
@@ -14,12 +14,11 @@
 #include "libebl_CPU.h"
 #include <assert.h>
 
-#define R_TYPE(name)           PASTE (RELOC_PREFIX, name)
-#define PASTE(a, b)            PASTE_1 (a, b)
-#define PASTE_1(a, b)          a##b
-#define R_NAME(name)           R_NAME_1 (RELOC_PREFIX, name)
-#define R_NAME_1(prefix, type) R_NAME_2 (prefix, type)
-#define R_NAME_2(prefix, type) #prefix #type
+#define R_TYPE(name)   PASTE (RELOC_PREFIX, name)
+#define PASTE(a, b)    PASTE_1 (a, b)
+#define PASTE_1(a, b)  a##b
+#define R_NAME(name)   R_NAME_1 (R_TYPE (name))
+#define R_NAME_1(type) #type
 
 #define RELOC_TYPES            STRINGIFIED_PASTE (BACKEND, reloc.def)
 #define STRINGIFIED_PASTE(a, b)        STRINGIFY (PASTE (a, b))

diff --git a/configure.ac b/configure.ac
index 20d1939..7c6b715 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl
-AC_INIT([Red Hat elfutils],[0.119],[http://bugzilla.redhat.com/bugzilla/],
+AC_INIT([Red Hat elfutils],[0.118],[http://bugzilla.redhat.com/bugzilla/],
        [elfutils])
 
 AC_CONFIG_AUX_DIR([config])

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 83e96db..43e6bbe 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,8 +1,6 @@
-2005-12-10  Ulrich Drepper  <drepper@redhat.com
+2005-12-07  Roland McGrath  <roland@redhat.com>
 
-       * run-readelf-test1.sh: New file.
-       * Makefile.am (TESTS): Add run-readelf-test1.sh.
-       (EXTRA_DIST): Likewise.
+       * ecp.c (main): Use elf_end to clean up.
 
 2005-11-25  Roland McGrath  <roland@redhat.com>
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4da3bed..0446759 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -58,7 +58,7 @@ TESTS = run-arextract.sh run-arsymtest.sh newfile test-nlist \
        run-elflint-test.sh run-elflint-self.sh run-ranlib-test.sh \
        run-ranlib-test2.sh run-ranlib-test3.sh run-ranlib-test4.sh \
        run-addrscopes.sh run-strings-test.sh run-funcscopes.sh \
-       run-find-prologues.sh run-allregs.sh run-readelf-test1.sh
+       run-find-prologues.sh run-allregs.sh
 # run-show-ciefde.sh
 
 if !STANDALONE
@@ -94,7 +94,7 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \
             testfile20.bz2 testfile20.index.bz2 \
             testfile21.bz2 testfile21.index.bz2 \
             testfile22.bz2 testfile23.bz2 testfile24.bz2 testfile25.bz2 \
-            coverage.sh test-subr.sh test-wrapper.sh run-readelf-test1.sh
+            coverage.sh test-subr.sh test-wrapper.sh
 
 installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir) \
                              bindir=$(DESTDIR)$(bindir) \

diff --git a/tests/ecp.c b/tests/ecp.c
index 15bc71c..7bae3af 100644 (file)
--- a/tests/ecp.c
+++ b/tests/ecp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 Red Hat, Inc.
+/* Copyright (C) 2002, 2005 Red Hat, Inc.
    Written by Ulrich Drepper <drepper@redhat.com>, 2002.
 
    This program is Open Source software; you can redistribute it and/or
@@ -82,7 +82,10 @@ main (int argc, char *argv[])
   if (elf_update (outelf, ELF_C_WRITE) == -1)
     error (EXIT_FAILURE, 0, "elf_update failed: %s", elf_errmsg (-1));
 
+  elf_end (outelf);
   close (outfd);
 
+  elf_end (inelf);
+
   return 0;
 }

diff --git a/tests/run-readelf-test1.sh b/tests/run-readelf-test1.sh
deleted file mode 100755 (executable)
index 5cd4a2c..0000000
--- a/tests/run-readelf-test1.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2005 Red Hat, Inc.
-# Written by Ulrich Drepper <drepper@redhat.com>, 2005.
-#
-# This program is Open Source software; you can redistribute it and/or
-# modify it under the terms of the Open Software License version 1.0 as
-# published by the Open Source Initiative.
-#
-# You should have received a copy of the Open Software License along
-# with this program; if not, you may obtain a copy of the Open Software
-# License version 1.0 from http://www.opensource.org/licenses/osl.php or
-# by writing the Open Source Initiative c/o Lawrence Rosen, Esq.,
-# 3001 King Ranch Road, Ukiah, CA 95482.
-. $srcdir/test-subr.sh
-
-original=${original:-testfile11}
-stripped=${stripped:-testfile7}
-debugout=${debugfile:+-f testfile.debug.temp -F $debugfile}
-
-testfiles testfile3
-
-tempfiles testfile.temp
-
-testrun ../src/readelf -r testfile3 > testfile.temp
-
-diff -u - testfile.temp <<EOF
-
-Relocation section [ 8] '.rel.got' for section [19] '.got' at offset 0x294 contains 1 entry:
-  Offset      Type                 Value       Name
-  0x08049544  386_GLOB_DAT         0000000000  __gmon_start__
-
-Relocation section [ 9] '.rel.plt' for section [11] '.plt' at offset 0x29c contains 4 entries:
-  Offset      Type                 Value       Name
-  0x08049534  386_JMP_SLOT         0x080482e4  __register_frame_info
-  0x08049538  386_JMP_SLOT         0x080482f4  __deregister_frame_info
-  0x0804953c  386_JMP_SLOT         0x08048304  __libc_start_main
-  0x08049540  386_JMP_SLOT         0x08048314  __cxa_finalize
-EOF
-
-exit 0