From d804e72cf0b39827289d2d08a74fa12e0d8a39b9 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 8 Dec 2005 01:35:42 +0000 Subject: [PATCH] 2005-12-07 Roland McGrath * ecp.c (main): Use elf_end to clean up. --- NEWS | 4 ---- backends/ChangeLog | 4 ---- backends/common-reloc.c | 11 +++++------ configure.ac | 2 +- tests/ChangeLog | 6 ++---- tests/Makefile.am | 4 ++-- tests/ecp.c | 5 ++++- tests/run-readelf-test1.sh | 40 -------------------------------------- 8 files changed, 14 insertions(+), 62 deletions(-) delete mode 100755 tests/run-readelf-test1.sh diff --git a/NEWS b/NEWS index 4c46203ba..f8b7b62bd 100644 --- 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 2c05737b6..defd725f9 100644 --- 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 * 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 b1805373d..0575e131c 100644 --- a/backends/common-reloc.c +++ b/backends/common-reloc.c @@ -14,12 +14,11 @@ #include "libebl_CPU.h" #include -#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 20d1939c0..7c6b7150f 100644 --- 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 83e96db00..43e6bbe54 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,8 +1,6 @@ -2005-12-10 Ulrich Drepper - * 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 diff --git a/tests/Makefile.am b/tests/Makefile.am index 4da3bed41..044675960 100644 --- 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 15bc71cc3..7bae3af49 100644 --- 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 , 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 index 5cd4a2ce1..000000000 --- a/tests/run-readelf-test1.sh +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# Copyright (C) 2005 Red Hat, Inc. -# Written by Ulrich Drepper , 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 <