diff -u libunwind-0.99/config.sub libunwind-0.99/config.sub --- libunwind-0.99/config.sub +++ libunwind-0.99/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-06-11' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,7 +122,6 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -153,9 +152,6 @@ os= basic_machine=$1 ;; - -bluegene*) - os=-cnk - ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -253,16 +249,13 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -275,7 +268,6 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -285,7 +277,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -294,7 +286,7 @@ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) + | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -337,17 +329,14 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -369,20 +358,20 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-* | z80-*) + | z8k-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -450,10 +439,6 @@ basic_machine=m68k-apollo os=-bsd ;; - aros) - basic_machine=i386-pc - os=-aros - ;; aux) basic_machine=m68k-apple os=-aux @@ -470,18 +455,10 @@ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` os=-linux ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -549,10 +526,6 @@ basic_machine=m88k-motorola os=-sysv3 ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1155,10 +1128,6 @@ basic_machine=z8k-unknown os=-sim ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1197,7 +1166,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1267,11 +1236,10 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1280,7 +1248,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1420,9 +1388,6 @@ -zvmoe) os=-zvmoe ;; - -dicos*) - os=-dicos - ;; -none) ;; *) @@ -1620,7 +1585,7 @@ -sunos*) vendor=sun ;; - -cnk*|-aix*) + -aix*) vendor=ibm ;; -beos*) diff -u libunwind-0.99/config.guess libunwind-0.99/config.guess --- libunwind-0.99/config.guess +++ libunwind-0.99/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-06-10' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -170,7 +170,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ + | grep __ELF__ >/dev/null then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -324,9 +324,6 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -334,20 +331,7 @@ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -656,7 +640,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -812,7 +796,7 @@ x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -822,9 +806,6 @@ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -885,17 +866,40 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:* | mips64:Linux:*:*) + mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + CPU=mipsel #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 #else CPU= #endif @@ -927,13 +931,10 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep -q ld.so.1 + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -981,6 +982,17 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1046,7 +1058,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1090,11 +1102,8 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1132,16 +1141,6 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1154,7 +1153,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1217,9 +1216,6 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1328,9 +1324,6 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -u libunwind-0.99/debian/changelog libunwind-0.99/debian/changelog --- libunwind-0.99/debian/changelog +++ libunwind-0.99/debian/changelog @@ -1,3 +1,11 @@ +libunwind (0.99-0.2ubuntu1) lucid; urgency=low + + * debian/patches/100215_disable-setjmp.dpatch: (LP: #522106) + + catched patch from Fedora + (http://cvs.fedoraproject.org/viewvc/devel/libunwind/libunwind-disable-setjmp.patch?view=log) + + -- Stephan Hermann Mon, 15 Feb 2010 11:49:50 +0000 + libunwind (0.99-0.2) unstable; urgency=low * Non-maintainer upload. diff -u libunwind-0.99/debian/control libunwind-0.99/debian/control --- libunwind-0.99/debian/control +++ libunwind-0.99/debian/control @@ -1,7 +1,8 @@ Source: libunwind Priority: optional Section: libs -Maintainer: Matthieu Delahaye +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Matthieu Delahaye Uploaders: Al Stone Build-Depends: debhelper (>> 4.0.0), libatomic-ops-dev (>> 0.5.1), dpatch, autoconf, automake, libtool Standards-Version: 3.6.1 diff -u libunwind-0.99/debian/patches/00list libunwind-0.99/debian/patches/00list --- libunwind-0.99/debian/patches/00list +++ libunwind-0.99/debian/patches/00list @@ -1,0 +2 @@ +100215_disable-setjmp only in patch2: unchanged: --- libunwind-0.99.orig/debian/patches/100215_disable-setjmp.dpatch +++ libunwind-0.99/debian/patches/100215_disable-setjmp.dpatch @@ -0,0 +1,215 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 100215_disable-setjmp.dpatch by Stephan Hermann +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad libunwind-0.99~/src/Makefile.am libunwind-0.99/src/Makefile.am +--- libunwind-0.99~/src/Makefile.am 2009-05-08 16:34:10.000000000 +0000 ++++ libunwind-0.99/src/Makefile.am 2010-02-15 11:49:30.703870907 +0000 +@@ -12,7 +12,7 @@ + else + LIBRARIES_cdep = libunwind-ptrace.a + lib_LTLIBRARIES_cdep = libunwind.la +-lib_LTLIBRARIES_cdep_setjmp = libunwind-setjmp.la ++lib_LTLIBRARIES_cdep_setjmp = #libunwind-setjmp.la + endif + + ### libunwind-ptrace: +@@ -27,21 +27,21 @@ + ptrace/_UPT_reg_offset.c ptrace/_UPT_resume.c + + ### libunwind-setjmp: +-libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \ +- -version-info $(SETJMP_SO_VERSION) +-libunwind_setjmp_la_LIBADD = libunwind-$(arch).la -lc +-libunwind_setjmp_la_SOURCES_common = setjmp/setjmp_i.h \ +- setjmp/longjmp.c \ +- setjmp/siglongjmp.c +-libunwind_setjmp_la_SOURCES_arm = arm/siglongjmp.S +-libunwind_setjmp_la_SOURCES_ia64 = ia64/setjmp.S ia64/sigsetjmp.S \ +- ia64/longjmp.S ia64/siglongjmp.S +-libunwind_setjmp_la_SOURCES_hppa = hppa/siglongjmp.S +-libunwind_setjmp_la_SOURCES_mips = mips/siglongjmp.S +-libunwind_setjmp_la_SOURCES_x86 = x86/longjmp.S x86/siglongjmp.S +-libunwind_setjmp_la_SOURCES_x86_64 = x86_64/longjmp.S x86_64/siglongjmp.S +-libunwind_setjmp_la_SOURCES_ppc64 = ppc/longjmp.S ppc/siglongjmp.S +-libunwind_setjmp_la_SOURCES_ppc32 = ppc/longjmp.S ppc/siglongjmp.S ++#libunwind_setjmp_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \ ++# -version-info $(SETJMP_SO_VERSION) ++#libunwind_setjmp_la_LIBADD = libunwind-$(arch).la -lc ++#libunwind_setjmp_la_SOURCES_common = setjmp/setjmp_i.h \ ++# setjmp/longjmp.c \ ++# setjmp/siglongjmp.c ++#libunwind_setjmp_la_SOURCES_arm = arm/siglongjmp.S ++#libunwind_setjmp_la_SOURCES_ia64 = ia64/setjmp.S ia64/sigsetjmp.S \ ++# ia64/longjmp.S ia64/siglongjmp.S ++#libunwind_setjmp_la_SOURCES_hppa = hppa/siglongjmp.S ++#libunwind_setjmp_la_SOURCES_mips = mips/siglongjmp.S ++#libunwind_setjmp_la_SOURCES_x86 = x86/longjmp.S x86/siglongjmp.S ++#libunwind_setjmp_la_SOURCES_x86_64 = x86_64/longjmp.S x86_64/siglongjmp.S ++#libunwind_setjmp_la_SOURCES_ppc64 = ppc/longjmp.S ppc/siglongjmp.S ++#libunwind_setjmp_la_SOURCES_ppc32 = ppc/longjmp.S ppc/siglongjmp.S + + ### libunwind: + +@@ -359,8 +359,8 @@ + if !REMOTE_ONLY + libunwind_arm_la_LIBADD = libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ +- $(libunwind_setjmp_la_SOURCES_arm) ++# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ ++# $(libunwind_setjmp_la_SOURCES_arm) + else + if ARCH_IA64 + ia64_mk_Gcursor_i_SOURCES = ia64/mk_Gcursor_i.c +@@ -378,8 +378,8 @@ + if !REMOTE_ONLY + libunwind_ia64_la_LIBADD = libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ +- $(libunwind_setjmp_la_SOURCES_ia64) ++# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ ++# $(libunwind_setjmp_la_SOURCES_ia64) + else + if ARCH_HPPA + lib_LTLIBRARIES_arch = libunwind-hppa.la +@@ -389,8 +389,8 @@ + if !REMOTE_ONLY + libunwind_hppa_la_LIBADD = libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ +- $(libunwind_setjmp_la_SOURCES_hppa) ++# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ ++# $(libunwind_setjmp_la_SOURCES_hppa) + else + if ARCH_MIPS + lib_LTLIBRARIES_arch = libunwind-mips.la +@@ -400,8 +400,8 @@ + if !REMOTE_ONLY + libunwind_mips_la_LIBADD = libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ +- $(libunwind_setjmp_la_SOURCES_mips) ++# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ ++# $(libunwind_setjmp_la_SOURCES_mips) + else + if ARCH_X86 + lib_LTLIBRARIES_arch = libunwind-x86.la +@@ -411,8 +411,8 @@ + if !REMOTE_ONLY + libunwind_x86_la_LIBADD = libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ +- $(libunwind_setjmp_la_SOURCES_x86) ++# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ ++# $(libunwind_setjmp_la_SOURCES_x86) + else + if ARCH_X86_64 + lib_LTLIBRARIES_arch = libunwind-x86_64.la +@@ -422,8 +422,8 @@ + if !REMOTE_ONLY + libunwind_x86_64_la_LIBADD = libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ +- $(libunwind_setjmp_la_SOURCES_x86_64) ++# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ ++# $(libunwind_setjmp_la_SOURCES_x86_64) + else + if ARCH_PPC32 + lib_LTLIBRARIES_arch = libunwind-ppc32.la +@@ -433,8 +433,8 @@ + if !REMOTE_ONLY + libunwind_ppc32_la_LIBADD = libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ +- $(libunwind_setjmp_la_SOURCES_ppc32) ++# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ ++# $(libunwind_setjmp_la_SOURCES_ppc32) + else + if ARCH_PPC64 + lib_LTLIBRARIES_arch = libunwind-ppc64.la +@@ -444,8 +444,8 @@ + if !REMOTE_ONLY + libunwind_ppc64_la_LIBADD = libunwind.la -lc + endif +- libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ +- $(libunwind_setjmp_la_SOURCES_ppc64) ++# libunwind_setjmp_la_SOURCES = $(libunwind_setjmp_la_SOURCES_common) \ ++# $(libunwind_setjmp_la_SOURCES_ppc64) + + endif # ARCH_PPC64 + endif # ARCH_PPC32 +@@ -466,7 +466,7 @@ + + lib_LIBRARIES = $(LIBRARIES_cdep) + lib_LTLIBRARIES = $(lib_LTLIBRARIES_cdep) $(lib_LTLIBRARIES_arch) \ +- $(lib_LTLIBRARIES_cdep_setjmp) ++ # $(lib_LTLIBRARIES_cdep_setjmp) + + AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/tdep-$(arch) -I. + AM_CCASFLAGS = $(AM_CPPFLAGS) +@@ -488,16 +488,16 @@ + $(libunwind_mips_la_SOURCES_mips) \ + $(libunwind_x86_la_SOURCES_x86) \ + $(libunwind_x86_64_la_SOURCES_x86_64) \ +- $(libunwind_ptrace_a_SOURCES) \ +- $(libunwind_setjmp_la_SOURCES_common) \ +- $(libunwind_setjmp_la_SOURCES_arm) \ +- $(libunwind_setjmp_la_SOURCES_hppa) \ +- $(libunwind_setjmp_la_SOURCES_ia64) \ +- $(libunwind_setjmp_la_SOURCES_mips) \ +- $(libunwind_setjmp_la_SOURCES_x86) \ +- $(libunwind_setjmp_la_SOURCES_x86_64) \ +- $(libunwind_setjmp_la_SOURCES_ppc32) \ +- $(libunwind_setjmp_la_SOURCES_ppc64) ++ $(libunwind_ptrace_a_SOURCES) ++# $(libunwind_setjmp_la_SOURCES_common) \ ++# $(libunwind_setjmp_la_SOURCES_arm) \ ++# $(libunwind_setjmp_la_SOURCES_hppa) \ ++# $(libunwind_setjmp_la_SOURCES_ia64) \ ++# $(libunwind_setjmp_la_SOURCES_mips) \ ++# $(libunwind_setjmp_la_SOURCES_x86) \ ++# $(libunwind_setjmp_la_SOURCES_x86_64) \ ++# $(libunwind_setjmp_la_SOURCES_ppc32) \ ++# $(libunwind_setjmp_la_SOURCES_ppc64) + + + # The -version-info flag accepts an argument of the form +diff -urNad libunwind-0.99~/tests/Makefile.am libunwind-0.99/tests/Makefile.am +--- libunwind-0.99~/tests/Makefile.am 2009-05-08 16:34:10.000000000 +0000 ++++ libunwind-0.99/tests/Makefile.am 2010-02-15 11:49:30.703870907 +0000 +@@ -24,7 +24,8 @@ + Gia64-test-nat Lia64-test-nat \ + Gia64-test-rbs Lia64-test-rbs \ + Gia64-test-readonly Lia64-test-readonly \ +- ia64-test-setjmp ia64-test-sig ++ ia64-test-sig ++# ia64-test-setjmp + else + if ARCH_PPC64 + if USE_ALTIVEC +@@ -40,8 +41,9 @@ + Gtest-resume-sig Ltest-resume-sig \ + Gtest-dyn1 Ltest-dyn1 \ + test-async-sig test-flush-cache test-init-remote \ +- test-mem test-setjmp test-ptrace \ ++ test-mem test-ptrace \ + Ltest-nomalloc ++# test-setjmp + noinst_PROGRAMS_cdep = forker mapper test-ptrace-misc test-varargs \ + Gperf-simple Lperf-simple + +@@ -93,8 +95,8 @@ + LIBUNWIND = ../src/libunwind-$(arch).la $(LIBUNWIND_local) + LDADD = $(LIBUNWIND) + +-test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local) +-ia64_test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local) ++# test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local) ++# ia64_test_setjmp_LDADD = ../src/libunwind-setjmp.la $(LIBUNWIND_local) + test_ptrace_LDADD = ../src/libunwind-ptrace.a $(LIBUNWIND) + Ltest_concurrent_LDADD = $(LIBUNWIND) -lpthread + Gtest_concurrent_LDADD = $(LIBUNWIND) -lpthread