From 1c734b34b074f79b8c3b79705c43c48706f7376adde7c07c418a8c7ee8bb4c81 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 25 Jan 2012 14:13:15 +0000 Subject: [PATCH] - Amend patch to fix arm unwind table corruption. [bso#13449] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/binutils?expand=0&rev=83 --- binutils.changes | 5 +++++ bso13449.diff | 41 +++++++++++++++++++++++++++++++++++ cross-alpha-binutils.changes | 5 +++++ cross-arm-binutils.changes | 5 +++++ cross-hppa-binutils.changes | 5 +++++ cross-hppa64-binutils.changes | 5 +++++ cross-i386-binutils.changes | 5 +++++ cross-ia64-binutils.changes | 5 +++++ cross-mips-binutils.changes | 5 +++++ cross-ppc-binutils.changes | 5 +++++ cross-ppc64-binutils.changes | 5 +++++ cross-s390-binutils.changes | 5 +++++ cross-s390x-binutils.changes | 5 +++++ cross-sparc-binutils.changes | 5 +++++ cross-spu-binutils.changes | 5 +++++ cross-x86_64-binutils.changes | 5 +++++ 16 files changed, 116 insertions(+) diff --git a/binutils.changes b/binutils.changes index fcfe19c..c30bed2 100644 --- a/binutils.changes +++ b/binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/bso13449.diff b/bso13449.diff index b2fe29e..06411a9 100644 --- a/bso13449.diff +++ b/bso13449.diff @@ -2,6 +2,45 @@ * config/tc-arm.c (create_unwind_entry): Zero allocated table entries. +=================================================================== +RCS file: /cvs/src/src/gas/config/tc-arm.c,v +retrieving revision 1.511 +retrieving revision 1.512 +diff -u -r1.511 -r1.512 +--- src/gas/config/tc-arm.c 2011/12/07 16:58:34 1.511 ++++ src/gas/config/tc-arm.c 2011/12/15 10:21:49 1.512 +@@ -3540,6 +3540,7 @@ + record_alignment (now_seg, 2); + + ptr = frag_more (8); ++ memset (ptr, 0, 8); + where = frag_now_fix () - 8; + + /* Self relative offset of the function start. */ +@@ -19926,8 +19927,12 @@ + size = unwind.opcode_count - 2; + } + else +- /* An extra byte is required for the opcode count. */ +- size = unwind.opcode_count + 1; ++ { ++ gas_assert (unwind.personality_index == -1); ++ ++ /* An extra byte is required for the opcode count. */ ++ size = unwind.opcode_count + 1; ++ } + + size = (size + 3) >> 2; + if (size > 0xff) +@@ -19953,7 +19958,7 @@ + ptr += 4; + + /* Set the first byte to the number of additional words. */ +- data = size - 1; ++ data = size > 0 ? size - 1 : 0; + n = 3; + break; + =================================================================== RCS file: /cvs/src/src/gas/config/tc-arm.c,v retrieving revision 1.512 @@ -18,3 +57,5 @@ diff -u -r1.512 -r1.513 where = frag_now_fix () - ((size << 2) + 4); switch (unwind.personality_index) + + diff --git a/cross-alpha-binutils.changes b/cross-alpha-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-alpha-binutils.changes +++ b/cross-alpha-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-arm-binutils.changes +++ b/cross-arm-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-hppa-binutils.changes +++ b/cross-hppa-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-hppa64-binutils.changes +++ b/cross-hppa64-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-i386-binutils.changes +++ b/cross-i386-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-ia64-binutils.changes +++ b/cross-ia64-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-mips-binutils.changes +++ b/cross-mips-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-ppc-binutils.changes +++ b/cross-ppc-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-ppc64-binutils.changes +++ b/cross-ppc64-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-s390-binutils.changes +++ b/cross-s390-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-s390x-binutils.changes +++ b/cross-s390x-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-sparc-binutils.changes +++ b/cross-sparc-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-spu-binutils.changes +++ b/cross-spu-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes index fcfe19c..c30bed2 100644 --- a/cross-x86_64-binutils.changes +++ b/cross-x86_64-binutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 25 14:12:40 UTC 2012 - rguenther@suse.com + +- Amend patch to fix arm unwind table corruption. [bso#13449] + ------------------------------------------------------------------- Wed Jan 4 12:31:02 UTC 2012 - rguenther@suse.com