leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] x86-64: work around gcc4 issue with -Os in Dwarf2 stack unwind

Browse Source 
This fixes a problem with gcc4 mis-compiling the stack unwind code under
-Os, which resulted in 'stuck' messages whenever an assembly routine was
encountered.

(The second hunk is trivial cleanup.)

Signed-off-by: Jan Beulich <jbeulich@novell.com>
This commit is contained in:
Jan Beulich 2006-11-28 20:12:59 +01:00 committed by Andi Kleen
parent a3550a9c54
commit ff0a538d8b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/unwind.c
View File

@ -938,8 +938,11 @@ int unwind(struct unwind_frame_info *frame)
else { else {
retAddrReg = state.version <= 1 ? *ptr++ : get_uleb128(&ptr, end); retAddrReg = state.version <= 1 ? *ptr++ : get_uleb128(&ptr, end);
/* skip augmentation */ /* skip augmentation */
if (((const char *)(cie + 2))[1] == 'z') if (((const char *)(cie + 2))[1] == 'z') {
ptr += get_uleb128(&ptr, end); uleb128_t augSize = get_uleb128(&ptr, end);
ptr += augSize;
}
if (ptr > end if (ptr > end
|| retAddrReg >= ARRAY_SIZE(reg_info) || retAddrReg >= ARRAY_SIZE(reg_info)
|| REG_INVALID(retAddrReg) || REG_INVALID(retAddrReg)
@ -963,9 +966,7 @@ int unwind(struct unwind_frame_info *frame)
if (cie == NULL || fde == NULL) { if (cie == NULL || fde == NULL) {
#ifdef CONFIG_FRAME_POINTER #ifdef CONFIG_FRAME_POINTER
unsigned long top, bottom; unsigned long top, bottom;
#endif
#ifdef CONFIG_FRAME_POINTER
top = STACK_TOP(frame->task); top = STACK_TOP(frame->task);
bottom = STACK_BOTTOM(frame->task); bottom = STACK_BOTTOM(frame->task);
# if FRAME_RETADDR_OFFSET < 0 # if FRAME_RETADDR_OFFSET < 0