pool/elfutils
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 47102 from Base:System

Browse Source 
Copy from Base:System/elfutils based on submit request 47102 from user jones_tony

OBS-URL: https://build.opensuse.org/request/show/47102
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/elfutils?expand=0&rev=19
This commit is contained in:
OBS User autobuild 2010-09-09 12:43:00 +00:00 committed by Git OBS Bridge
commit d6e6af8d74
7 changed files with 138 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elfutils-0.147.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c3dbcc2ac3d12a00f1d8fee4fa3fa8b61dfa7491d9e790e4b6a2af542d739848
size 1777826

3
elfutils-0.148.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8aebfa4a745db21cf5429c9541fe482729b62efc7e53e9110151b4169fe887da
size 1811640

266
elfutils-portability.patch
View File

@ -1,14 +1,13 @@
From: Tony Jones <tonyj@suse.de>
Subject: Elfutils portability patch
Version: 0.147
References: https://fedorahosted.org/releases/e/l/elfutils/elfutils-portability.patch
Version: 0.148
References: https://fedorahosted.org/releases/e/l/elfutils/0.148/elfutils-portability.patch
Upstream: yes
This patch contains portability fixes that are regarded as generally useful
by the community but are not accepted by the elfutils maintainer (and are
therefore not in the git repository).
Following change is removed from the patch (as Factory is built using
GNU_SOURCE and thus %a is interpreted as having a float param):
@ -71,7 +70,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -193,6 +194,7 @@ SHELL = @SHELL@
@@ -194,6 +195,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -79,7 +78,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -256,7 +258,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
@@ -257,7 +259,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
-I$(top_srcdir)/libelf -I$(top_srcdir)/libdw
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
$($(*F)_no_Werror),,-Werror) $(if \
@ -88,7 +87,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
$(am__append_1)
@MUDFLAP_FALSE@libmudflap =
@@ -697,7 +699,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
@@ -698,7 +700,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
$(LINK) -shared -o $(@:.map=.so) \
-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
-Wl,--version-script,$(@:.so=.map) \
@ -187,7 +186,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -104,6 +105,7 @@ SHELL = @SHELL@
@@ -105,6 +106,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -206,7 +205,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
/* $libdir subdirectory containing libebl modules. */
#undef LIBEBL_SUBDIR
@@ -52,4 +55,7 @@
@@ -55,4 +58,7 @@
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
@ -216,7 +215,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
#include <eu-config.h>
--- elfutils/configure
+++ elfutils/configure
@@ -646,6 +646,8 @@ NEVER_TRUE
@@ -602,6 +602,8 @@ NEVER_TRUE
base_cpu
NATIVE_LD_FALSE
NATIVE_LD_TRUE
@ -225,67 +224,47 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEXLIB
LEX_OUTPUT_ROOT
LEX
@@ -4098,6 +4100,205 @@ $as_echo "$as_me: error: gcc with C99 su
@@ -3852,6 +3854,130 @@ if test "x$ac_cv_c99" != xyes; then :
as_fn_error "gcc with C99 support required" "$LINENO" 5
fi
+{ $as_echo "$as_me:$LINENO: checking for -Wextra option to $CC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wextra option to $CC" >&5
+$as_echo_n "checking for -Wextra option to $CC... " >&6; }
+if test "${ac_cv_cc_wextra+set}" = set; then
+if test "${ac_cv_cc_wextra+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ old_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wextra"
+cat >conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+void foo (void) { }
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_cc_wextra=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_cc_wextra=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$old_CFLAGS"
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cc_wextra" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_wextra" >&5
+$as_echo "$ac_cv_cc_wextra" >&6; }
+
+if test "x$ac_cv_cc_wextra" = xyes; then
+if test "x$ac_cv_cc_wextra" = xyes; then :
+ WEXTRA=-Wextra
+else
+ WEXTRA=-W
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for -fgnu89-inline option to $CC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fgnu89-inline option to $CC" >&5
+$as_echo_n "checking for -fgnu89-inline option to $CC... " >&6; }
+if test "${ac_cv_cc_gnu89_inline+set}" = set; then
+if test "${ac_cv_cc_gnu89_inline+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ old_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -fgnu89-inline -Werror"
+cat >conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+void foo (void)
+{
@ -295,45 +274,23 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
+extern inline void baz (void) {}
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_cc_gnu89_inline=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_cc_gnu89_inline=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$old_CFLAGS"
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cc_gnu89_inline" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cc_gnu89_inline" >&5
+$as_echo "$ac_cv_cc_gnu89_inline" >&6; }
+if test "x$ac_cv_cc_gnu89_inline" = xyes; then
+if test "x$ac_cv_cc_gnu89_inline" = xyes; then :
+ WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline"
+fi
+
+
+{ $as_echo "$as_me:$LINENO: checking for --as-needed linker option" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed linker option" >&5
+$as_echo_n "checking for --as-needed linker option... " >&6; }
+if test "${ac_cv_as_needed+set}" = set; then
+if test "${ac_cv_as_needed+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat > conftest.c <<EOF
@ -342,11 +299,11 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
+if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -fPIC -shared -o conftest.so conftest.c
+ -Wl,--as-needed 1>&5'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }
+then
+ ac_cv_as_needed=yes
+else
@ -354,26 +311,21 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
+fi
+rm -f conftest*
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_as_needed" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_as_needed" >&5
+$as_echo "$ac_cv_as_needed" >&6; }
+if test "x$ac_cv_as_needed" = xyes; then
+if test "x$ac_cv_as_needed" = xyes; then :
+ LD_AS_NEEDED=-Wl,--as-needed
+else
+ LD_AS_NEEDED=
+fi
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for __builtin_popcount" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5
+$as_echo_n "checking for __builtin_popcount... " >&6; }
+if test "${ac_cv_popcount+set}" = set; then
+if test "${ac_cv_popcount+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
@ -384,84 +336,50 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_popcount=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_popcount=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_popcount" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_popcount" >&5
+$as_echo "$ac_cv_popcount" >&6; }
+if test "x$ac_cv_popcount" = xyes; then
+if test "x$ac_cv_popcount" = xyes; then :
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_BUILTIN_POPCOUNT 1
+_ACEOF
+$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h
+
+fi
+
+
{ $as_echo "$as_me:$LINENO: checking for __thread support" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread support" >&5
$as_echo_n "checking for __thread support... " >&6; }
if test "${ac_cv_tls+set}" = set; then
@@ -4163,9 +4364,18 @@ fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_tls" >&5
if test "${ac_cv_tls+set}" = set; then :
@@ -3888,7 +4014,13 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_tls" >&5
$as_echo "$ac_cv_tls" >&6; }
if test "x$ac_cv_tls" != xyes; then
- { { $as_echo "$as_me:$LINENO: error: __thread support required" >&5
-$as_echo "$as_me: error: __thread support required" >&2;}
+ if test "$use_locks" = yes; then
+ { { $as_echo "$as_me:$LINENO: error: --enable-thread-safety requires __thread support" >&5
+$as_echo "$as_me: error: --enable-thread-safety requires __thread support" >&2;}
{ (exit 1); exit 1; }; }
if test "x$ac_cv_tls" != xyes; then :
- as_fn_error "__thread support required" "$LINENO" 5
+ if test "$use_locks" = yes; then :
+ as_fn_error "--enable-thread-safety requires __thread support" "$LINENO" 5
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define __thread /* empty: no multi-thread support */
+_ACEOF
+$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h
+
+fi
+
fi
@@ -5454,7 +5664,7 @@ ac_config_files="$ac_config_files versio
# Check whether --enable-largefile was given.
@@ -4874,7 +5006,7 @@ ac_config_files="$ac_config_files versio
# 1.234<whatever> -> 1234<whatever>
case "$PACKAGE_VERSION" in
-[0-9].*) eu_version="${PACKAGE_VERSION/./}" ;;
+[0-9].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;;
*) { { $as_echo "$as_me:$LINENO: error: confused by version number '$PACKAGE_VERSION'" >&5
$as_echo "$as_me: error: confused by version number '$PACKAGE_VERSION'" >&2;}
{ (exit 1); exit 1; }; } ;;
@@ -5489,7 +5699,7 @@ $as_echo "$as_me: error: confused by ver
*) as_fn_error "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;;
esac
case "$eu_version" in
@@ -4903,7 +5035,7 @@ case "$eu_version" in
esac
# Round up to the next release API (x.y) version.
@ -558,7 +476,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
AC_OUTPUT
--- elfutils/lib/ChangeLog
+++ elfutils/lib/ChangeLog
@@ -8,6 +8,9 @@
@@ -14,6 +14,9 @@
2009-01-23 Roland McGrath <roland@redhat.com>
@ -568,7 +486,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
* eu-config.h: Add multiple inclusion protection.
2009-01-17 Ulrich Drepper <drepper@redhat.com>
@@ -64,6 +67,11 @@
@@ -70,6 +73,11 @@
* Makefile.am (libeu_a_SOURCES): Add it.
* system.h: Declare crc32_file.
@ -610,7 +528,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -127,6 +128,7 @@ SHELL = @SHELL@
@@ -128,6 +129,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -618,7 +536,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -189,7 +191,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
@@ -190,7 +192,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
-I$(srcdir)/../libelf
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
$($(*F)_no_Werror),,-Werror) $(if \
@ -651,7 +569,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -175,6 +176,7 @@ SHELL = @SHELL@
@@ -176,6 +177,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = 1
@ -659,7 +577,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -238,7 +240,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
@@ -239,7 +241,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
-I$(top_srcdir)/libdw
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
$($(*F)_no_Werror),,-Werror) $(if \
@ -712,7 +630,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = lex.$(<F:lex.l=)
@@ -144,6 +145,7 @@ SHELL = @SHELL@
@@ -145,6 +146,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -720,7 +638,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -207,7 +209,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
@@ -208,7 +210,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
-I$(srcdir)/../libdw -I$(srcdir)/../libasm
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
$($(*F)_no_Werror),,-Werror) $(if \
@ -731,7 +649,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
@MUDFLAP_FALSE@libmudflap =
--- elfutils/libdw/ChangeLog
+++ elfutils/libdw/ChangeLog
@@ -82,6 +82,10 @@
@@ -276,6 +276,10 @@
* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
@ -742,7 +660,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
2009-08-10 Roland McGrath <roland@redhat.com>
* dwarf_getscopevar.c: Use dwarf_diename.
@@ -850,6 +854,11 @@
@@ -1044,6 +1048,11 @@
2005-05-31 Roland McGrath <roland@redhat.com>
@ -756,7 +674,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
--- elfutils/libdw/libdw.h
+++ elfutils/libdw/libdw.h
@@ -814,7 +814,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
@@ -842,7 +842,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
/* Inline optimizations. */
@ -767,7 +685,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
dwarf_whatattr (Dwarf_Attribute *attr)
--- elfutils/libdw/Makefile.in
+++ elfutils/libdw/Makefile.in
@@ -189,6 +189,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -191,6 +191,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
@ -775,7 +693,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -217,6 +218,7 @@ SHELL = @SHELL@
@@ -220,6 +221,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = 1
@ -783,7 +701,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -279,7 +281,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
@@ -282,7 +284,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
-I$(srcdir)/../libelf
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
$($(*F)_no_Werror),,-Werror) $(if \
@ -794,7 +712,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
@MUDFLAP_FALSE@libmudflap =
--- elfutils/libdwfl/ChangeLog
+++ elfutils/libdwfl/ChangeLog
@@ -1207,6 +1207,11 @@
@@ -1265,6 +1265,11 @@
2005-07-21 Roland McGrath <roland@redhat.com>
@ -816,7 +734,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -209,6 +210,7 @@ SHELL = @SHELL@
@@ -210,6 +211,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = 1
@ -824,7 +742,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -272,7 +274,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
@@ -273,7 +275,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
-I$(srcdir)/../libdw
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
$($(*F)_no_Werror),,-Werror) $(if \
@ -857,7 +775,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -171,6 +172,7 @@ SHELL = @SHELL@
@@ -172,6 +173,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = 1
@ -865,7 +783,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -234,7 +236,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
@@ -235,7 +237,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
-I$(srcdir)/../libasm
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
$($(*F)_no_Werror),,-Werror) $(if \
@ -876,7 +794,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
@MUDFLAP_FALSE@libmudflap =
--- elfutils/libelf/ChangeLog
+++ elfutils/libelf/ChangeLog
@@ -651,6 +651,11 @@
@@ -657,6 +657,11 @@
* elf.h: Update from glibc.
@ -918,7 +836,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -217,6 +218,7 @@ SHELL = @SHELL@
@@ -218,6 +219,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = 1
@ -926,7 +844,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -278,7 +280,7 @@ zip_LIBS = @zip_LIBS@
@@ -279,7 +281,7 @@ zip_LIBS = @zip_LIBS@
INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
$($(*F)_no_Werror),,-Werror) $(if \
@ -945,7 +863,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -103,6 +104,7 @@ SHELL = @SHELL@
@@ -104,6 +105,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -963,7 +881,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -183,6 +184,7 @@ SHELL = @SHELL@
@@ -184,6 +185,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -973,7 +891,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
--- elfutils/src/ChangeLog
+++ elfutils/src/ChangeLog
@@ -98,8 +98,16 @@
@@ -165,8 +165,16 @@
* readelf.c (attr_callback): Use print_block only when we don't use
print_ops.
@ -990,7 +908,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
* ar.c (do_oper_extract): Use pathconf instead of statfs.
2009-08-01 Ulrich Drepper <drepper@redhat.com>
@@ -446,6 +456,11 @@
@@ -513,6 +523,11 @@
that matches its PT_LOAD's p_flags &~ PF_W. On sparc, PF_X really
is valid in RELRO.
@ -1002,7 +920,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
2008-02-29 Roland McGrath <roland@redhat.com>
* readelf.c (print_attributes): Add a cast.
@@ -697,6 +712,8 @@
@@ -764,6 +779,8 @@
* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
@ -1011,7 +929,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
2007-10-15 Roland McGrath <roland@redhat.com>
* make-debug-archive.in: New file.
@@ -1136,6 +1153,10 @@
@@ -1203,6 +1220,10 @@
* elflint.c (valid_e_machine): Add EM_ALPHA.
Reported by Christian Aichinger <Greek0@gmx.net>.
@ -1022,7 +940,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
2006-08-08 Ulrich Drepper <drepper@redhat.com>
* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
@@ -1212,6 +1233,10 @@
@@ -1279,6 +1300,10 @@
* Makefile.am: Add hacks to create dependency files for non-generic
linker.
@ -1033,7 +951,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
2006-06-12 Ulrich Drepper <drepper@redhat.com>
* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
@@ -1560,6 +1585,11 @@
@@ -1627,6 +1652,11 @@
* readelf.c (print_debug_loc_section): Fix indentation for larger
address size.
@ -1099,7 +1017,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -256,6 +257,7 @@ SHELL = @SHELL@
@@ -257,6 +258,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -1107,7 +1025,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -320,7 +322,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
@@ -321,7 +323,7 @@ INCLUDES = -I. -I$(srcdir) -I$(top_srcdi
-I$(srcdir)/../libasm
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
$($(*F)_no_Werror),,-Werror) $(if \
@ -1116,7 +1034,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
$($(*F)_no_Wformat),-Wno-format,-Wformat=2) $($(*F)_CFLAGS) \
$(am__append_1)
@MUDFLAP_FALSE@libmudflap =
@@ -367,6 +369,9 @@ strings_no_Wformat = yes
@@ -368,6 +370,9 @@ strings_no_Wformat = yes
addr2line_no_Wformat = yes
# XXX While the file is not finished, don't warn about this
ldgeneric_no_Wunused = yes
@ -1128,7 +1046,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
size_LDADD = $(libelf) $(libeu) $(libmudflap)
--- elfutils/src/readelf.c
+++ elfutils/src/readelf.c
@@ -7655,7 +7655,7 @@ dump_archive_index (Elf *elf, const char
@@ -7845,7 +7845,7 @@ dump_archive_index (Elf *elf, const char
if (unlikely (elf_rand (elf, as_off) == 0)
|| unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
== NULL))
@ -1230,7 +1148,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
cannot set access and modification date of '%s'"), fname);
--- elfutils/tests/ChangeLog
+++ elfutils/tests/ChangeLog
@@ -150,6 +150,8 @@
@@ -154,6 +154,8 @@
2008-01-21 Roland McGrath <roland@redhat.com>
@ -1239,7 +1157,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
* testfile45.S.bz2: Add tests for cltq, cqto.
* testfile45.expect.bz2: Adjust.
@@ -858,6 +860,11 @@
@@ -862,6 +864,11 @@
* Makefile.am (TESTS): Add run-elflint-test.sh.
(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
@ -1272,7 +1190,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -400,6 +401,7 @@ SHELL = @SHELL@
@@ -401,6 +402,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -1280,7 +1198,7 @@ GNU_SOURCE and thus %a is interpreted as having a float param):
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -461,7 +463,7 @@ zip_LIBS = @zip_LIBS@
@@ -462,7 +464,7 @@ zip_LIBS = @zip_LIBS@
INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/lib -I.. $(am__append_2)
AM_CFLAGS = -std=gnu99 -Wall -Wshadow $(if \
$($(*F)_no_Werror),,-Werror) $(if \

42
elfutils-robustify.patch
View File

@ -1,7 +1,7 @@
From: Tony Jones <tonyj@suse.de>
Subject: Elfutils robustify patch
Version: 0.147
References: https://fedorahosted.org/releases/e/l/elfutils/elfutils-robustify.patch
Version: 0.148
References: https://fedorahosted.org/releases/e/l/elfutils/0.148/elfutils-robustify.patch
Upstream: yes
This patch contains functional/stability fixes that are regarded as generally
@ -10,7 +10,7 @@ are therefore not in the git repository).
--- elfutils/libelf/ChangeLog
+++ elfutils/libelf/ChangeLog
@@ -643,10 +643,53 @@
@@ -649,10 +649,53 @@
If section content hasn't been read yet, do it before looking for the
block size. If no section data present, infer size of section header.
@ -875,7 +875,7 @@ are therefore not in the git repository).
#endif /* libelfP.h */
--- elfutils/src/ChangeLog
+++ elfutils/src/ChangeLog
@@ -1548,6 +1548,16 @@
@@ -1615,6 +1615,16 @@
object symbols or symbols with unknown type.
(check_rel): Likewise.
@ -892,7 +892,7 @@ are therefore not in the git repository).
2005-06-08 Roland McGrath <roland@redhat.com>
* readelf.c (print_ops): Add consts.
@@ -1593,6 +1603,19 @@
@@ -1660,6 +1670,19 @@
* readelf.c (dwarf_tag_string): Add new tags.
@ -1189,7 +1189,7 @@ are therefore not in the git repository).
idx, section_name (ebl, idx),
--- elfutils/src/readelf.c
+++ elfutils/src/readelf.c
@@ -1171,6 +1171,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
@@ -1172,6 +1172,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
GElf_Sym sym_mem;
@ -1198,7 +1198,7 @@ are therefore not in the git repository).
printf ((grpref[0] & GRP_COMDAT)
? ngettext ("\
\nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
@@ -1183,8 +1185,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
@@ -1184,8 +1186,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
data->d_size / sizeof (Elf32_Word) - 1),
elf_ndxscn (scn),
elf_strptr (ebl->elf, shstrndx, shdr->sh_name),
@ -1209,7 +1209,7 @@ are therefore not in the git repository).
?: gettext ("<INVALID SYMBOL>"),
data->d_size / sizeof (Elf32_Word) - 1);
@@ -1335,7 +1337,8 @@ static void
@@ -1336,7 +1338,8 @@ static void
handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
{
int class = gelf_getclass (ebl->elf);
@ -1219,7 +1219,7 @@ are therefore not in the git repository).
Elf_Data *data;
size_t cnt;
size_t shstrndx;
@@ -1350,6 +1353,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
@@ -1351,6 +1354,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
error (EXIT_FAILURE, 0,
gettext ("cannot get section header string table index"));
@ -1231,7 +1231,7 @@ are therefore not in the git repository).
printf (ngettext ("\
\nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
"\
@@ -1359,9 +1367,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
@@ -1360,9 +1368,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
shdr->sh_offset,
(int) shdr->sh_link,
@ -1242,7 +1242,7 @@ are therefore not in the git repository).
fputs_unlocked (gettext (" Type Value\n"), stdout);
for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
@@ -1944,6 +1950,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
@@ -1945,6 +1951,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
error (EXIT_FAILURE, 0,
gettext ("cannot get section header string table index"));
@ -1256,7 +1256,7 @@ are therefore not in the git repository).
/* Now we can compute the number of entries in the section. */
unsigned int nsyms = data->d_size / (class == ELFCLASS32
? sizeof (Elf32_Sym)
@@ -1954,15 +1967,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
@@ -1955,15 +1968,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
nsyms),
(unsigned int) elf_ndxscn (scn),
elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
@ -1273,7 +1273,7 @@ are therefore not in the git repository).
fputs_unlocked (class == ELFCLASS32
? gettext ("\
@@ -2198,7 +2208,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
@@ -2199,7 +2209,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
error (EXIT_FAILURE, 0,
gettext ("cannot get section header string table index"));
@ -1288,7 +1288,7 @@ are therefore not in the git repository).
printf (ngettext ("\
\nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
"\
@@ -2209,9 +2225,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
@@ -2210,9 +2226,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
shdr->sh_offset,
(unsigned int) shdr->sh_link,
@ -1299,7 +1299,7 @@ are therefore not in the git repository).
unsigned int offset = 0;
for (int cnt = shdr->sh_info; --cnt >= 0; )
@@ -2264,8 +2278,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
@@ -2265,8 +2279,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
error (EXIT_FAILURE, 0,
gettext ("cannot get section header string table index"));
@ -1315,7 +1315,7 @@ are therefore not in the git repository).
printf (ngettext ("\
\nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
"\
@@ -2277,9 +2297,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
@@ -2278,9 +2298,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
shdr->sh_offset,
(unsigned int) shdr->sh_link,
@ -1326,7 +1326,7 @@ are therefore not in the git repository).
unsigned int offset = 0;
for (int cnt = shdr->sh_info; --cnt >= 0; )
@@ -2541,8 +2559,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
@@ -2542,8 +2560,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
filename = NULL;
}
@ -1342,7 +1342,7 @@ are therefore not in the git repository).
printf (ngettext ("\
\nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'",
"\
@@ -2554,9 +2578,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
@@ -2555,9 +2579,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
shdr->sh_offset,
(unsigned int) shdr->sh_link,
@ -1353,7 +1353,7 @@ are therefore not in the git repository).
/* Now we can finally look at the actual contents of this section. */
for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
@@ -2608,7 +2630,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
@@ -2609,7 +2631,17 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
for (Elf32_Word cnt = 0; cnt < nbucket; ++cnt)
++counts[lengths[cnt]];
@ -1372,7 +1372,7 @@ are therefore not in the git repository).
printf (ngettext ("\
\nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
"\
@@ -2621,9 +2653,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
@@ -2622,9 +2654,7 @@ print_hash_info (Ebl *ebl, Elf_Scn *scn,
shdr->sh_addr,
shdr->sh_offset,
(unsigned int) shdr->sh_link,
@ -1383,7 +1383,7 @@ are therefore not in the git repository).
if (extrastr != NULL)
fputs (extrastr, stdout);
@@ -4265,6 +4295,16 @@ print_debug_aranges_section (Dwfl_Module
@@ -4312,6 +4342,16 @@ print_debug_aranges_section (Dwfl_Module
return;
}

13
elfutils.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Aug 26 03:32:26 CEST 2010 - tonyj@suse.de
- Update to 0.148
- Upstream changelog
- libdw: Accept DWARF 4 format: new functions dwarf_next_unit,
dwarf_offdie_types. New functions dwarf_lineisa,
dwarf_linediscriminator, dwarf_lineop_index.
- libdwfl: Fixes in core-file handling, support cores from PIEs.
When working from build IDs, don't open a named file that mismatches.
- readelf: Handle DWARF 4 formats.
-------------------------------------------------------------------
Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de

6
elfutils.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package elfutils (Version 0.147)
# spec file for package elfutils (Version 0.148)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -20,8 +20,8 @@
Name: elfutils
License: GPLv2 ; GPLv2+ ; LGPLv2.1+
Version: 0.147
Release: 2
Version: 0.148
Release: 1
Summary: Higher-level library to access ELF
Group: System/Libraries
Url: http://elfutils.fedorahosted.org

4
libebl-prototype-fix.diff
View File

@ -26,9 +26,9 @@ Update from K&R to ANSI prototype. This fix should go upstream.
static size_t
-lookup (htab, hval, val)
- NAME *htab;
- unsigned long int hval;
- HASHTYPE hval;
- TYPE val __attribute__ ((unused));
+lookup (NAME *htab, unsigned long int hval, TYPE val __attribute__((unused)))
+lookup (NAME *htab, HASHTYPE hval, TYPE val __attribute__((unused)))
{
/* First hash function: simply take the modul but prevent zero. */
size_t idx = 1 + hval % htab->size;