one more arm fix got added since, added it directly in klibc 2.0.1-3, see belows diff.
Thank you, -- maks commit 9472b6159928b14c19ec23f1be704459a630b52a Author: maximilian attems <[email protected]> Date: Mon Oct 8 21:58:43 2012 +0200 release 2.0.1-3 diff --git a/debian/changelog b/debian/changelog index f595336..fde3e9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +klibc (2.0.1-3) unstable; urgency=medium + + [ Bill Pringlemeir ] + * [f05ff11] [klibc] fix ARM longjmp with zero 'val'. + + -- maximilian attems <[email protected]> Mon, 08 Oct 2012 21:57:01 +0200 + klibc (2.0.1-2) unstable; urgency=low [ Sven Joachim ] diff --git a/debian/patches/0001-klibc-PATCH-fix-ARM-longjmp-with-zero-val.patch b/debian/patches/0001-klibc-PATCH-fix-ARM-longjmp-with-zero-val.patch new file mode 100644 index 0000000..920684d --- /dev/null +++ b/debian/patches/0001-klibc-PATCH-fix-ARM-longjmp-with-zero-val.patch @@ -0,0 +1,35 @@ +From f05ff116bb9edbbb81d82fa47b78e630ce878470 Mon Sep 17 00:00:00 2001 +From: Bill Pringlemeir <[email protected]> +Date: Tue, 2 Oct 2012 13:29:52 -0400 +Subject: [PATCH] [klibc] [PATCH] fix ARM longjmp with zero 'val'. + +We need to set the condition codes on the ARM. The previous version was +using a left over condition code from the caller. Also, use conditional +execution to eliminate branch and reduce size. + +Signed-off-by: Bill Pringlemeir <[email protected]> +[ backported to 3.0.1-2 - maks ] +Signed-off-by: maximilian attems <[email protected]> +--- + usr/klibc/arch/arm/setjmp.S | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/usr/klibc/arch/arm/setjmp.S b/usr/klibc/arch/arm/setjmp.S +index 92ffc43..9f96274 100644 +--- a/usr/klibc/arch/arm/setjmp.S ++++ b/usr/klibc/arch/arm/setjmp.S +@@ -40,8 +40,9 @@ setjmp: + .type longjmp, #function + longjmp: + ldmia r0, {r4, r5, r6, r7, r8, r9, r10, fp, sp, lr} +- mov r0, r1 ++ movs r0, r1 ++ moveq r0, #1 + BX(lr) + .size longjmp,.-longjmp + + #else /* __thumb__ */ + +-- +1.7.10.4 + diff --git a/debian/patches/series b/debian/patches/series index b9b1598..5fa4e19 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,4 @@ Fix-minimal-mv-to-work-across-fs 0001-klibc-Avoid-overflow-for-very-long-variable-name.patch 0001-klibc-arm-fix-trashing-of-callee-saved-registers-in-.patch 0002-klibc-arm-unbreak-armhf-shared-binaries-those-with-t.patch - +0001-klibc-PATCH-fix-ARM-longjmp-with-zero-val.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
