Upstream-Status: Backport Generated by copying the whole dir, running `sh debian/autogen.sh` and diffing. Index: elfutils-0.148/backends/Makefile.in =================================================================== --- elfutils-0.148.orig/backends/Makefile.in 2010-07-03 13:07:10.000000000 +0000 +++ elfutils-0.148/backends/Makefile.in 2010-07-03 13:13:52.000000000 +0000 @@ -77,39 +77,54 @@ am__objects_4 = ia64_init.$(OBJEXT) ia64_symbol.$(OBJEXT) \ ia64_regs.$(OBJEXT) ia64_retval.$(OBJEXT) libebl_ia64_pic_a_OBJECTS = $(am_libebl_ia64_pic_a_OBJECTS) +libebl_m68k_pic_a_AR = $(AR) $(ARFLAGS) +libebl_m68k_pic_a_LIBADD = +am__objects_5 = m68k_init.$(OBJEXT) m68k_symbol.$(OBJEXT) \ + m68k_regs.$(OBJEXT) +libebl_m68k_pic_a_OBJECTS = $(am_libebl_m68k_pic_a_OBJECTS) +libebl_mips_pic_a_AR = $(AR) $(ARFLAGS) +libebl_mips_pic_a_LIBADD = +am__objects_6 = mips_init.$(OBJEXT) mips_symbol.$(OBJEXT) \ + mips_regs.$(OBJEXT) mips_retval.$(OBJEXT) +libebl_mips_pic_a_OBJECTS = $(am_libebl_mips_pic_a_OBJECTS) +libebl_parisc_pic_a_AR = $(AR) $(ARFLAGS) +libebl_parisc_pic_a_LIBADD = +am__objects_7 = parisc_init.$(OBJEXT) parisc_symbol.$(OBJEXT) \ + parisc_regs.$(OBJEXT) parisc_retval.$(OBJEXT) +libebl_parisc_pic_a_OBJECTS = $(am_libebl_parisc_pic_a_OBJECTS) libebl_ppc64_pic_a_AR = $(AR) $(ARFLAGS) libebl_ppc64_pic_a_LIBADD = -am__objects_5 = ppc64_init.$(OBJEXT) ppc64_symbol.$(OBJEXT) \ +am__objects_8 = ppc64_init.$(OBJEXT) ppc64_symbol.$(OBJEXT) \ ppc64_retval.$(OBJEXT) ppc64_corenote.$(OBJEXT) \ ppc_regs.$(OBJEXT) ppc_auxv.$(OBJEXT) ppc_attrs.$(OBJEXT) \ ppc_syscall.$(OBJEXT) libebl_ppc64_pic_a_OBJECTS = $(am_libebl_ppc64_pic_a_OBJECTS) libebl_ppc_pic_a_AR = $(AR) $(ARFLAGS) libebl_ppc_pic_a_LIBADD = -am__objects_6 = ppc_init.$(OBJEXT) ppc_symbol.$(OBJEXT) \ +am__objects_9 = ppc_init.$(OBJEXT) ppc_symbol.$(OBJEXT) \ ppc_retval.$(OBJEXT) ppc_regs.$(OBJEXT) ppc_corenote.$(OBJEXT) \ ppc_auxv.$(OBJEXT) ppc_attrs.$(OBJEXT) ppc_syscall.$(OBJEXT) libebl_ppc_pic_a_OBJECTS = $(am_libebl_ppc_pic_a_OBJECTS) libebl_s390_pic_a_AR = $(AR) $(ARFLAGS) libebl_s390_pic_a_LIBADD = -am__objects_7 = s390_init.$(OBJEXT) s390_symbol.$(OBJEXT) \ +am__objects_10 = s390_init.$(OBJEXT) s390_symbol.$(OBJEXT) \ s390_regs.$(OBJEXT) s390_retval.$(OBJEXT) libebl_s390_pic_a_OBJECTS = $(am_libebl_s390_pic_a_OBJECTS) libebl_sh_pic_a_AR = $(AR) $(ARFLAGS) libebl_sh_pic_a_LIBADD = -am__objects_8 = sh_init.$(OBJEXT) sh_symbol.$(OBJEXT) \ +am__objects_11 = sh_init.$(OBJEXT) sh_symbol.$(OBJEXT) \ sh_corenote.$(OBJEXT) sh_regs.$(OBJEXT) sh_retval.$(OBJEXT) libebl_sh_pic_a_OBJECTS = $(am_libebl_sh_pic_a_OBJECTS) libebl_sparc_pic_a_AR = $(AR) $(ARFLAGS) libebl_sparc_pic_a_LIBADD = -am__objects_9 = sparc_init.$(OBJEXT) sparc_symbol.$(OBJEXT) \ +am__objects_12 = sparc_init.$(OBJEXT) sparc_symbol.$(OBJEXT) \ sparc_regs.$(OBJEXT) sparc_retval.$(OBJEXT) \ sparc_corenote.$(OBJEXT) sparc64_corenote.$(OBJEXT) \ sparc_auxv.$(OBJEXT) libebl_sparc_pic_a_OBJECTS = $(am_libebl_sparc_pic_a_OBJECTS) libebl_x86_64_pic_a_AR = $(AR) $(ARFLAGS) libebl_x86_64_pic_a_LIBADD = -am__objects_10 = x86_64_init.$(OBJEXT) x86_64_symbol.$(OBJEXT) \ +am__objects_13 = x86_64_init.$(OBJEXT) x86_64_symbol.$(OBJEXT) \ x86_64_corenote.$(OBJEXT) x86_64_cfi.$(OBJEXT) \ x86_64_retval.$(OBJEXT) x86_64_regs.$(OBJEXT) \ i386_auxv.$(OBJEXT) x86_64_syscall.$(OBJEXT) @@ -124,15 +139,18 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libebl_alpha_pic_a_SOURCES) $(libebl_arm_pic_a_SOURCES) \ $(libebl_i386_pic_a_SOURCES) $(libebl_ia64_pic_a_SOURCES) \ - $(libebl_ppc64_pic_a_SOURCES) $(libebl_ppc_pic_a_SOURCES) \ - $(libebl_s390_pic_a_SOURCES) $(libebl_sh_pic_a_SOURCES) \ - $(libebl_sparc_pic_a_SOURCES) $(libebl_x86_64_pic_a_SOURCES) -DIST_SOURCES = $(libebl_alpha_pic_a_SOURCES) \ - $(libebl_arm_pic_a_SOURCES) $(libebl_i386_pic_a_SOURCES) \ - $(libebl_ia64_pic_a_SOURCES) $(libebl_ppc64_pic_a_SOURCES) \ + $(libebl_m68k_pic_a_SOURCES) $(libebl_mips_pic_a_SOURCES) \ + $(libebl_parisc_pic_a_SOURCES) $(libebl_ppc64_pic_a_SOURCES) \ $(libebl_ppc_pic_a_SOURCES) $(libebl_s390_pic_a_SOURCES) \ $(libebl_sh_pic_a_SOURCES) $(libebl_sparc_pic_a_SOURCES) \ $(libebl_x86_64_pic_a_SOURCES) +DIST_SOURCES = $(libebl_alpha_pic_a_SOURCES) \ + $(libebl_arm_pic_a_SOURCES) $(libebl_i386_pic_a_SOURCES) \ + $(libebl_ia64_pic_a_SOURCES) $(libebl_m68k_pic_a_SOURCES) \ + $(libebl_mips_pic_a_SOURCES) $(libebl_parisc_pic_a_SOURCES) \ + $(libebl_ppc64_pic_a_SOURCES) $(libebl_ppc_pic_a_SOURCES) \ + $(libebl_s390_pic_a_SOURCES) $(libebl_sh_pic_a_SOURCES) \ + $(libebl_sparc_pic_a_SOURCES) $(libebl_x86_64_pic_a_SOURCES) DATA = $(noinst_DATA) HEADERS = $(noinst_HEADERS) ETAGS = etags @@ -270,11 +288,12 @@ CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \ libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS)) textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi -modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 +modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 parisc mips m68k libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \ - libebl_s390_pic.a + libebl_s390_pic.a libebl_parisc_pic.a libebl_mips_pic.a \ + libebl_m68k_pic.a noinst_LIBRARIES = $(libebl_pic) noinst_DATA = $(libebl_pic:_pic.a=.so) @@ -328,6 +347,15 @@ s390_SRCS = s390_init.c s390_symbol.c s390_regs.c s390_retval.c libebl_s390_pic_a_SOURCES = $(s390_SRCS) am_libebl_s390_pic_a_OBJECTS = $(s390_SRCS:.c=.os) +parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c +libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) +am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) +mips_SRCS = mips_init.c mips_symbol.c mips_regs.c mips_retval.c +libebl_mips_pic_a_SOURCES = $(mips_SRCS) +am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os) +m68k_SRCS = m68k_init.c m68k_symbol.c m68k_regs.c +libebl_m68k_pic_a_SOURCES = $(m68k_SRCS) +am_libebl_m68k_pic_a_OBJECTS = $(m68k_SRCS:.c=.os) noinst_HEADERS = libebl_CPU.h common-reloc.c linux-core-note.c x86_corenote.c EXTRA_DIST = $(foreach m,$(modules),$($(m)_SRCS)) $(modules:=_reloc.def) all: all-am @@ -383,6 +411,18 @@ -rm -f libebl_ia64_pic.a $(libebl_ia64_pic_a_AR) libebl_ia64_pic.a $(libebl_ia64_pic_a_OBJECTS) $(libebl_ia64_pic_a_LIBADD) $(RANLIB) libebl_ia64_pic.a +libebl_m68k_pic.a: $(libebl_m68k_pic_a_OBJECTS) $(libebl_m68k_pic_a_DEPENDENCIES) + -rm -f libebl_m68k_pic.a + $(libebl_m68k_pic_a_AR) libebl_m68k_pic.a $(libebl_m68k_pic_a_OBJECTS) $(libebl_m68k_pic_a_LIBADD) + $(RANLIB) libebl_m68k_pic.a +libebl_mips_pic.a: $(libebl_mips_pic_a_OBJECTS) $(libebl_mips_pic_a_DEPENDENCIES) + -rm -f libebl_mips_pic.a + $(libebl_mips_pic_a_AR) libebl_mips_pic.a $(libebl_mips_pic_a_OBJECTS) $(libebl_mips_pic_a_LIBADD) + $(RANLIB) libebl_mips_pic.a +libebl_parisc_pic.a: $(libebl_parisc_pic_a_OBJECTS) $(libebl_parisc_pic_a_DEPENDENCIES) + -rm -f libebl_parisc_pic.a + $(libebl_parisc_pic_a_AR) libebl_parisc_pic.a $(libebl_parisc_pic_a_OBJECTS) $(libebl_parisc_pic_a_LIBADD) + $(RANLIB) libebl_parisc_pic.a libebl_ppc64_pic.a: $(libebl_ppc64_pic_a_OBJECTS) $(libebl_ppc64_pic_a_DEPENDENCIES) -rm -f libebl_ppc64_pic.a $(libebl_ppc64_pic_a_AR) libebl_ppc64_pic.a $(libebl_ppc64_pic_a_OBJECTS) $(libebl_ppc64_pic_a_LIBADD) @@ -439,6 +479,17 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_regs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_retval.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_symbol.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_init.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_regs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_symbol.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_init.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_regs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_retval.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_symbol.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_init.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_regs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_retval.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_symbol.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_corenote.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_init.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_retval.Po@am__quote@ Index: elfutils-0.148/configure =================================================================== --- elfutils-0.148.orig/configure 2010-07-03 13:06:16.000000000 +0000 +++ elfutils-0.148/configure 2010-07-03 13:13:49.000000000 +0000 @@ -602,6 +602,8 @@ base_cpu NATIVE_LD_FALSE NATIVE_LD_TRUE +LD_AS_NEEDED +WEXTRA LEXLIB LEX_OUTPUT_ROOT LEX @@ -3852,6 +3854,130 @@ as_fn_error "gcc with C99 support required" "$LINENO" 5 fi +{ $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 : + $as_echo_n "(cached) " >&6 +else + old_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -Wextra" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void foo (void) { } +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_cc_wextra=yes +else + 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:${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 : + WEXTRA=-Wextra +else + WEXTRA=-W +fi + +{ $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 : + $as_echo_n "(cached) " >&6 +else + old_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -fgnu89-inline -Werror" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +void foo (void) +{ + inline void bar (void) {} + bar (); +} +extern inline void baz (void) {} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_cc_gnu89_inline=yes +else + 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:${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 : + WEXTRA="${WEXTRA:+$WEXTRA }-fgnu89-inline" +fi + +{ $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 : + $as_echo_n "(cached) " >&6 +else + cat > conftest.c <&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then + ac_cv_as_needed=yes +else + ac_cv_as_needed=no +fi +rm -f conftest* +fi +{ $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 : + LD_AS_NEEDED=-Wl,--as-needed +else + LD_AS_NEEDED= +fi + + +{ $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 : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +exit (__builtin_popcount (127)); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_popcount=yes +else + ac_cv_popcount=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $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 : + +$as_echo "#define HAVE_BUILTIN_POPCOUNT 1" >>confdefs.h + +fi + { $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 : @@ -3888,7 +4014,13 @@ { $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_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 + +$as_echo "#define __thread /* empty: no multi-thread support */" >>confdefs.h + +fi fi # Check whether --enable-largefile was given. @@ -4874,7 +5006,7 @@ # 1.234 -> 1234 case "$PACKAGE_VERSION" in -[0-9].*) eu_version="${PACKAGE_VERSION/./}" ;; +[0-9].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;; *) as_fn_error "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; esac case "$eu_version" in @@ -4903,7 +5035,7 @@ esac # Round up to the next release API (x.y) version. -eu_version=$[($eu_version + 999) / 1000] +eu_version=`expr \( $eu_version + 999 \) / 1000` cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure