diff options
Diffstat (limited to 'libelf')
| -rw-r--r-- | libelf/ChangeLog | 7 | ||||
| -rw-r--r-- | libelf/Makefile.am | 5 | ||||
| -rw-r--r-- | libelf/elf.h | 6 | ||||
| -rw-r--r-- | libelf/elf_gnu_hash.c | 68 | ||||
| -rw-r--r-- | libelf/libelf.h | 6 | ||||
| -rw-r--r-- | libelf/libelf.map | 5 |
6 files changed, 4 insertions, 93 deletions
diff --git a/libelf/ChangeLog b/libelf/ChangeLog index db4108d3..d42bf18b 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,10 +1,3 @@ -2006-07-06 Ulrich Drepper <[email protected]> - - * elf_gnu_hash.c: New file. - * libelf.h: Declare elf_gnu_hash. - * Makefile.am (libelf_a_SOURCES): Add elf_gnu_hash. - * libelf.map: Add elf_gnu_map for version ELFUTILS_1.2. - 2006-05-28 Ulrich Drepper <[email protected]> * elf32_updatefile.c (updatemmap): Preserve section content if diff --git a/libelf/Makefile.am b/libelf/Makefile.am index fb177d04..51965cee 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in ## -## Copyright (C) 1996-2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc. +## Copyright (C) 1996-2001, 2002, 2003, 2004, 2005 Red Hat, Inc. ## This file is part of Red Hat elfutils. ## ## Red Hat elfutils is free software; you can redistribute it and/or modify @@ -96,8 +96,7 @@ libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \ elf_clone.c \ gelf_getlib.c gelf_update_lib.c \ elf32_offscn.c elf64_offscn.c gelf_offscn.c \ - elf_getaroff.c \ - elf_gnu_hash.c + elf_getaroff.c if !MUDFLAP libelf_pic_a_SOURCES = diff --git a/libelf/elf.h b/libelf/elf.h index 57b099e2..c98bb523 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -1,5 +1,5 @@ /* This file defines standard ELF types, structures, and macros. - Copyright (C) 1995-2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1995-2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -330,7 +330,6 @@ typedef struct #define SHT_SYMTAB_SHNDX 18 /* Extended section indeces */ #define SHT_NUM 19 /* Number of defined types. */ #define SHT_LOOS 0x60000000 /* Start OS-specific */ -#define SHT_GNU_HASH 0x6ffffff6 /* GNU style symbol hash table. */ #define SHT_GNU_LIBLIST 0x6ffffff7 /* Prelink library list */ #define SHT_CHECKSUM 0x6ffffff8 /* Checksum for DSO content. */ #define SHT_LOSUNW 0x6ffffffa /* Sun-specific low bound. */ @@ -700,9 +699,6 @@ typedef struct If any adjustment is made to the ELF object after it has been built these entries will need to be adjusted. */ #define DT_ADDRRNGLO 0x6ffffe00 -#define DT_GNU_HASH 0x6ffffef5 /* Address of GNU symbol hash table */ -#define DT_TLSDESC_PLT 0x6ffffef6 -#define DT_TLSDESC_GOT 0x6ffffef7 #define DT_GNU_CONFLICT 0x6ffffef8 /* Start of conflict section */ #define DT_GNU_LIBLIST 0x6ffffef9 /* Library list */ #define DT_CONFIG 0x6ffffefa /* Configuration information. */ diff --git a/libelf/elf_gnu_hash.c b/libelf/elf_gnu_hash.c deleted file mode 100644 index efaee435..00000000 --- a/libelf/elf_gnu_hash.c +++ /dev/null @@ -1,68 +0,0 @@ -/* GNU-style Hash function used in ELF implementations. - Copyright (C) 2006 Red Hat, Inc. - This file is part of Red Hat elfutils. - Contributed by Ulrich Drepper <[email protected]>, 2006. - - Red Hat elfutils is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by the - Free Software Foundation; version 2 of the License. - - Red Hat elfutils is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License along - with Red Hat elfutils; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA. - - In addition, as a special exception, Red Hat, Inc. gives You the - additional right to link the code of Red Hat elfutils with code licensed - under any Open Source Initiative certified open source license - (http://www.opensource.org/licenses/index.php) which requires the - distribution of source code with any binary distribution and to - distribute linked combinations of the two. Non-GPL Code permitted under - this exception must only link to the code of Red Hat elfutils through - those well defined interfaces identified in the file named EXCEPTION - found in the source code files (the "Approved Interfaces"). The files - of Non-GPL Code may instantiate templates or use macros or inline - functions from the Approved Interfaces without causing the resulting - work to be covered by the GNU General Public License. Only Red Hat, - Inc. may make changes or additions to the list of Approved Interfaces. - Red Hat's grant of this exception is conditioned upon your not adding - any new exceptions. If you wish to add a new Approved Interface or - exception, please contact Red Hat. You must obey the GNU General Public - License in all respects for all of the Red Hat elfutils code and other - code used in conjunction with Red Hat elfutils except the Non-GPL Code - covered by this exception. If you modify this file, you may extend this - exception to your version of the file, but you are not obligated to do - so. If you do not wish to provide this exception without modification, - you must delete this exception statement from your version and license - this file solely under the GPL without exception. - - Red Hat elfutils is an included package of the Open Invention Network. - An included package of the Open Invention Network is a package for which - Open Invention Network licensees cross-license their patents. No patent - license is granted, either expressly or impliedly, by designation as an - included package. Should you wish to participate in the Open Invention - Network licensing program, please visit www.openinventionnetwork.com - <http://www.openinventionnetwork.com>. */ - -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - -#include <libelfP.h> - -/* Get the implementation. */ -#include <dl-hash.h> - -unsigned long int -elf_gnu_hash (string) - const char *string; -{ - uint_fast32_t h = 5381; - for (unsigned char c = *string; c != '\0'; c = *++string) - h = h * 33 + c; - return h & 0xffffffff; -} diff --git a/libelf/libelf.h b/libelf/libelf.h index 27271847..7d7d39e8 100644 --- a/libelf/libelf.h +++ b/libelf/libelf.h @@ -1,5 +1,5 @@ /* Interface for libelf. - Copyright (C) 1998, 1999, 2000, 2002, 2004, 2005, 2006 Red Hat, Inc. + Copyright (C) 1998, 1999, 2000, 2002, 2004, 2005 Red Hat, Inc. This file is part of Red Hat elfutils. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -371,10 +371,6 @@ extern void elf_fill (int __fill); extern unsigned long int elf_hash (const char *__string) __attribute__ ((__pure__)); -/* Compute hash value using the GNU-specific hash function. */ -extern unsigned long int elf_gnu_hash (const char *__string) - __attribute__ ((__pure__)); - /* Compute simple checksum from permanent parts of the ELF file. */ extern long int elf32_checksum (Elf *__elf); diff --git a/libelf/libelf.map b/libelf/libelf.map index 9549c317..b2a65e84 100644 --- a/libelf/libelf.map +++ b/libelf/libelf.map @@ -112,8 +112,3 @@ ELFUTILS_1.1.1 { gelf_offscn; elf_getaroff; } ELFUTILS_1.1; - -ELFUTILS_1.2 { - global: - elf_gnu_hash; -} ELFUTILS_1.1.1; |