diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-11-12 17:25:13 +0100 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2012-11-12 17:25:13 +0100 |
| commit | 267c357afd2b2015831086c5c7e6523c1db1ac68 (patch) | |
| tree | 5c9c6e563581d9e8a1b9e30e3095e0348f164198 | |
| parent | 22e8201a0f9c40536c50df5702867718df52d073 (diff) | |
.
| -rw-r--r-- | boot | 11 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libdw/dwarf_begin_elf.c | 8 | ||||
| -rw-r--r-- | src/readelf.c | 16 |
4 files changed, 7 insertions, 30 deletions
@@ -1,11 +0,0 @@ -#! /bin/bash -if ! test -f ./backends/libebl_x86_64.so;then - echo ERROR: ./backends/libebl_x86_64.so -else - test -d lib - mkdir -p lib64 - test -h lib/elfutils || ln -s ../backends lib/elfutils - test -h lib64/elfutils || ln -s ../backends lib64/elfutils - export LD_LIBRARY_PATH=$PWD/backends:$PWD/libdw:$PWD/libelf:$PWD/libasm:$LD_LIBRARY_PATH -fi -echo OK diff --git a/configure.ac b/configure.ac index 67d39134..01c55104 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_CONFIG_AUX_DIR([config]) AC_CONFIG_FILES([config/Makefile]) AC_COPYRIGHT([Copyright (C) 1996-2012 Red Hat, Inc.]) -dnl AC_PREREQ(2.63) dnl Minimum Autoconf version required. +AC_PREREQ(2.63) dnl Minimum Autoconf version required. dnl We use GNU make extensions; automake 1.10 defaults to -Wportability. AM_INIT_AUTOMAKE([gnits 1.8 -Wno-portability dist-bzip2 no-dist-gzip]) diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c index 8d1e7a08..a9c826ce 100644 --- a/libdw/dwarf_begin_elf.c +++ b/libdw/dwarf_begin_elf.c @@ -48,14 +48,6 @@ #if USE_ZLIB # include <endian.h> # define crc32 loser_crc32 -# ifndef be64toh -# include <byteswap.h> -# if __BYTE_ORDER == __LITTLE_ENDIAN -# define be64toh(x) bswap_64 (x) -# else -# define be64toh(x) (x) -# endif -# endif # include <zlib.h> # undef crc32 #endif diff --git a/src/readelf.c b/src/readelf.c index 14b0acb0..fa2d75cc 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -3949,11 +3949,10 @@ struct listptr #define listptr_offset_size(p) ((p)->dwarf64 ? 8 : 4) #define listptr_address_size(p) ((p)->addr64 ? 8 : 4) -static const char *listptr_name; static int -compare_listptr (const void *a, const void *b) +compare_listptr (const void *a, const void *b, void *arg) { - const char *const name = listptr_name; + const char *name = arg; struct listptr *p1 = (void *) a; struct listptr *p2 = (void *) b; @@ -4034,11 +4033,8 @@ static void sort_listptr (struct listptr_table *table, const char *name) { if (table->n > 0) - { - listptr_name = name; - qsort (table->table, table->n, sizeof table->table[0], - &compare_listptr); - } + qsort_r (table->table, table->n, sizeof table->table[0], + &compare_listptr, (void *) name); } static bool @@ -4247,7 +4243,7 @@ print_debug_ranges_section (Dwfl_Module *dwflmod, offset, &readp, endp)) continue; - if (unlikely (data->d_size - offset < (size_t) address_size * 2)) + if (unlikely (data->d_size - offset < address_size * 2)) { printf (gettext (" [%6tx] <INVALID DATA>\n"), offset); break; @@ -6030,7 +6026,7 @@ print_debug_loc_section (Dwfl_Module *dwflmod, offset, &readp, endp)) continue; - if (unlikely (data->d_size - offset < (size_t) address_size * 2)) + if (unlikely (data->d_size - offset < address_size * 2)) { printf (gettext (" [%6tx] <INVALID DATA>\n"), offset); break; |