From 184b2d42207667089c20208d8c63c4fcb2d481aa Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Tue, 15 Apr 2008 00:02:27 -0400 Subject: unwinder build fix for STACK_{TOP,BOTTOM} macro name collisions 2008-04-15 Frank Ch. Eigler * unwind/i386.h (STACK_BOTTOM, STACK_TOP): Comment out these unused definitions, for they collide with some kernels (2.6.25-0.121.rc5.git4 rawhide). --- runtime/unwind/i386.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'runtime/unwind') diff --git a/runtime/unwind/i386.h b/runtime/unwind/i386.h index 1f69b4a9..6511f76a 100644 --- a/runtime/unwind/i386.h +++ b/runtime/unwind/i386.h @@ -38,8 +38,8 @@ struct unwind_frame_info #define UNW_FP(frame) (frame)->regs.bp #define FRAME_RETADDR_OFFSET 4 #define FRAME_LINK_OFFSET 0 -#define STACK_BOTTOM(tsk) STACK_LIMIT((tsk)->thread.sp0) -#define STACK_TOP(tsk) ((tsk)->thread.sp0) +/* #define STACK_BOTTOM(tsk) STACK_LIMIT((tsk)->thread.sp0) */ +/* #define STACK_TOP(tsk) ((tsk)->thread.sp0) */ #else #define UNW_FP(frame) ((void)(frame), 0) #endif @@ -63,8 +63,8 @@ struct unwind_frame_info #define UNW_FP(frame) (frame)->regs.ebp #define FRAME_RETADDR_OFFSET 4 #define FRAME_LINK_OFFSET 0 -#define STACK_BOTTOM(tsk) STACK_LIMIT((tsk)->thread.esp0) -#define STACK_TOP(tsk) ((tsk)->thread.esp0) +/* #define STACK_BOTTOM(tsk) STACK_LIMIT((tsk)->thread.esp0) */ +/* #define STACK_TOP(tsk) ((tsk)->thread.esp0) */ #else #define UNW_FP(frame) ((void)(frame), 0) #endif -- cgit From ca1655b01e0f15289f5b8e7b760373c733cbdd83 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Tue, 15 Apr 2008 17:44:32 -0400 Subject: PR6410: unwinder-less architecture tolerance --- runtime/unwind/unwind.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'runtime/unwind') diff --git a/runtime/unwind/unwind.h b/runtime/unwind/unwind.h index 8651cb9e..ae5e75d3 100644 --- a/runtime/unwind/unwind.h +++ b/runtime/unwind/unwind.h @@ -13,6 +13,8 @@ #ifndef _STP_UNWIND_H_ #define _STP_UNWIND_H_ +#ifdef STP_USE_DWARF_UNWINDER + #if defined (__x86_64__) #include "x86_64.h" #elif defined (__i386__) @@ -139,4 +141,6 @@ static const u32 bad_cie, not_fde; static const u32 *cie_for_fde(const u32 *fde, const struct _stp_module *); static signed fde_pointer_type(const u32 *cie); + +#endif /* STP_USE_DWARF_UNWINDER */ #endif /*_STP_UNWIND_H_*/ -- cgit From 4f7a75f2cb3394290d1093a031546aa848ace929 Mon Sep 17 00:00:00 2001 From: Martin Hunt Date: Tue, 15 Apr 2008 21:10:34 -0400 Subject: 2.6.25 fixes and stack level limits. --- runtime/unwind/i386.h | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'runtime/unwind') diff --git a/runtime/unwind/i386.h b/runtime/unwind/i386.h index 6511f76a..79e6ba73 100644 --- a/runtime/unwind/i386.h +++ b/runtime/unwind/i386.h @@ -34,15 +34,6 @@ struct unwind_frame_info #define UNW_PC(frame) (frame)->regs.ip #define UNW_SP(frame) (frame)->regs.sp -#ifdef STP_USE_FRAME_POINTER -#define UNW_FP(frame) (frame)->regs.bp -#define FRAME_RETADDR_OFFSET 4 -#define FRAME_LINK_OFFSET 0 -/* #define STACK_BOTTOM(tsk) STACK_LIMIT((tsk)->thread.sp0) */ -/* #define STACK_TOP(tsk) ((tsk)->thread.sp0) */ -#else -#define UNW_FP(frame) ((void)(frame), 0) -#endif #define UNW_REGISTER_INFO \ PTREGS_INFO(ax), \ @@ -59,15 +50,6 @@ struct unwind_frame_info #define UNW_PC(frame) (frame)->regs.eip #define UNW_SP(frame) (frame)->regs.esp -#ifdef STP_USE_FRAME_POINTER -#define UNW_FP(frame) (frame)->regs.ebp -#define FRAME_RETADDR_OFFSET 4 -#define FRAME_LINK_OFFSET 0 -/* #define STACK_BOTTOM(tsk) STACK_LIMIT((tsk)->thread.esp0) */ -/* #define STACK_TOP(tsk) ((tsk)->thread.esp0) */ -#else -#define UNW_FP(frame) ((void)(frame), 0) -#endif #define UNW_REGISTER_INFO \ PTREGS_INFO(eax), \ -- cgit