From 184b2d42207667089c20208d8c63c4fcb2d481aa Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Tue, 15 Apr 2008 00:02:27 -0400 Subject: [PATCH] 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/ChangeLog | 6 ++++++ runtime/unwind/i386.h | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/runtime/ChangeLog b/runtime/ChangeLog index 09a3e35d5..69eb6c367 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,9 @@ +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). + 2008-04-13 Frank Ch. Eigler * print.c (_stp_pbuf_full): New function to note full print buffer. diff --git a/runtime/unwind/i386.h b/runtime/unwind/i386.h index 1f69b4a92..6511f76a6 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 -- 2.43.5