Fix merge conflict.
Fix merge conflict.

2004/12/02 23:51:00-08:00 hp.com!davidm
(do_backtrace): Also print the symbol offset.  Increase nesting-level
	tolerance to 64 so we can test programs with deeply nested
	call-chains without triggering spurious warnings.


2004/11/30 22:44:47-08:00 mostang.com!davidm
(do_backtrace): Print IP if unw_get_proc_info() fails.

2004/11/23 18:01:09-08:00 mostang.com!davidm
(do_backtrace): Fix "start_ip might be used uninitialized" warning.

(Logical change 1.290)

djwatson/libunwind,atanasyan/libunwind,zeldin/platform_external_libunwind,wdv4758h/libunwind,unkadoug/libunwind,tronical/libunwind,bo-on-software/libunwind,frida/libunwind,tony/libunwind,fillexen/libunwind,evaautomation/libunwind,dreal-deps/libunwind,androidarmv6/android_external_libunwind,cloudius-systems/libunwind,project-zerus/libunwind,Keno/libunwind,mpercy/libunwind,geekboxzone/mmallow_external_libunwind,Keno/libunwind,igprof/libunwind,geekboxzone/lollipop_external_libunwind,zliu2014/libunwind-tilegx,0xlab/0xdroid-external_libunwind,geekboxzone/lollipop_external_libunwind,Chilledheart/libunwind,fdoray/libunwind,evaautomation/libunwind,tkelman/libunwind,olibc/libunwind,androidarmv6/android_external_libunwind,0xlab/0xdroid-external_libunwind,rogwfu/libunwind,martyone/libunwind,yuyichao/libunwind,SyndicateRogue/libunwind,olibc/libunwind,project-zerus/libunwind,DroidSim/platform_external_libunwind,tony/libunwind,cms-externals/libunwind,martyone/libunwind,SyndicateRogue/libunwind,vegard/libunwind,olibc/libunwind,unkadoug/libunwind,fillexen/libunwind,vtjnash/libunwind,cms-externals/libunwind,lat/libunwind,rantala/libunwind,adsharma/libunwind,krytarowski/libunwind,atanasyan/libunwind-android,DroidSim/platform_external_libunwind,fdoray/libunwind,jrmuizel/libunwind,rntz/libunwind,rogwfu/libunwind,dropbox/libunwind,mpercy/libunwind,yuyichao/libunwind,adsharma/libunwind,tkelman/libunwind,ehsan/libunwind,CyanogenMod/android_external_libunwind,jrmuizel/libunwind,atanasyan/libunwind,geekboxzone/mmallow_external_libunwind,bo-on-software/libunwind,vegard/libunwind,krytarowski/libunwind,android-ia/platform_external_libunwind,DroidSim/platform_external_libunwind,rantala/libunwind,atanasyan/libunwind,adsharma/libunwind,atanasyan/libunwind-android,SyndicateRogue/libunwind,fillexen/libunwind,fdoray/libunwind,pathscale/libunwind,Chilledheart/libunwind,rntz/libunwind,krytarowski/libunwind,androidarmv6/android_external_libunwind,frida/libunwind,tony/libunwind,rntz/libunwind,joyent/libunwind,cloudius-systems/libunwind,tronical/libunwind,geekboxzone/mmallow_external_libunwind,evaautomation/libunwind,project-zerus/libunwind,dropbox/libunwind,bo-on-software/libunwind,maltek/platform_external_libunwind,joyent/libunwind,zeldin/platform_external_libunwind,tronical/libunwind,libunwind/libunwind,0xlab/0xdroid-external_libunwind,djwatson/libunwind,frida/libunwind,dagar/libunwind,jrmuizel/libunwind,dreal-deps/libunwind,cloudius-systems/libunwind,wdv4758h/libunwind,vegard/libunwind,yuyichao/libunwind,wdv4758h/libunwind,rantala/libunwind,lat/libunwind,cms-externals/libunwind,zeldin/platform_external_libunwind,android-ia/platform_external_libunwind,ehsan/libunwind,vtjnash/libunwind,pathscale/libunwind,joyent/libunwind,libunwind/libunwind,atanasyan/libunwind-android,dagar/libunwind,rogwfu/libunwind,igprof/libunwind,vtjnash/libunwind,libunwind/libunwind,Keno/libunwind,djwatson/libunwind,maltek/platform_external_libunwind,dagar/libunwind,maltek/platform_external_libunwind,lat/libunwind,unkadoug/libunwind,zliu2014/libunwind-tilegx,ehsan/libunwind,igprof/libunwind,android-ia/platform_external_libunwind,geekboxzone/lollipop_external_libunwind,dreal-deps/libunwind,Chilledheart/libunwind,CyanogenMod/android_external_libunwind,dropbox/libunwind,zliu2014/libunwind-tilegx,CyanogenMod/android_external_libunwind,mpercy/libunwind,martyone/libunwind,pathscale/libunwind,tkelman/libunwind