Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff0a538d authored by Jan Beulich's avatar Jan Beulich Committed by Andi Kleen
Browse files

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



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: default avatarJan Beulich <jbeulich@novell.com>
parent a3550a9c

kernel/unwind.c

+5 −4
Original line number Diff line number Diff line
@@ -938,8 +938,11 @@ int unwind(struct unwind_frame_info *frame) 
		else {

			retAddrReg = state.version <= 1 ? *ptr++ : get_uleb128(&ptr, end);

			/* skip augmentation */

			if (((const char *)(cie + 2))[1] == 'z')

				ptr += get_uleb128(&ptr, end);

			if (((const char *)(cie + 2))[1] == 'z') {

				uleb128_t augSize = get_uleb128(&ptr, end);



				ptr += augSize;

			}

			if (ptr > end

			   || retAddrReg >= ARRAY_SIZE(reg_info)

			   || REG_INVALID(retAddrReg)
@@ -963,9 +966,7 @@ int unwind(struct unwind_frame_info *frame) 
	if (cie == NULL || fde == NULL) {

#ifdef CONFIG_FRAME_POINTER

		unsigned long top, bottom;

#endif



#ifdef CONFIG_FRAME_POINTER

		top = STACK_TOP(frame->task);

		bottom = STACK_BOTTOM(frame->task);

# if FRAME_RETADDR_OFFSET < 0