From f9e546b068b9eb4b7b9d08be1a26d47d9ae8a2cd Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 14 Feb 2009 00:09:27 +0000 Subject: fix gcc 4.3.x segfault triggered by using -frename-registers (reproduced on arm, might be relevant for other platforms as well) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14505 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../gcc/patches/4.3.1/400-arm_register_fix.patch | 24 ++++++++++++++++++++++ .../gcc/patches/4.3.2/400-arm_register_fix.patch | 24 ++++++++++++++++++++++ .../gcc/patches/4.3.3/400-arm_register_fix.patch | 24 ++++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 toolchain/gcc/patches/4.3.1/400-arm_register_fix.patch create mode 100644 toolchain/gcc/patches/4.3.2/400-arm_register_fix.patch create mode 100644 toolchain/gcc/patches/4.3.3/400-arm_register_fix.patch diff --git a/toolchain/gcc/patches/4.3.1/400-arm_register_fix.patch b/toolchain/gcc/patches/4.3.1/400-arm_register_fix.patch new file mode 100644 index 000000000..2fb5aa627 --- /dev/null +++ b/toolchain/gcc/patches/4.3.1/400-arm_register_fix.patch @@ -0,0 +1,24 @@ +Fixes GCC PR36350 + +--- a/gcc/regrename.c ++++ b/gcc/regrename.c +@@ -783,6 +783,10 @@ build_def_use (basic_block bb) + recog_data.operand_type[i] = OP_INOUT; + } + ++ /* Unshare dup_loc RTL */ ++ for (i = 0; i < recog_data.n_dups; i++) ++ *recog_data.dup_loc[i] = copy_rtx(*recog_data.dup_loc[i]); ++ + /* Step 1: Close chains for which we have overlapping reads. */ + for (i = 0; i < n_ops; i++) + scan_rtx (insn, recog_data.operand_loc[i], +@@ -813,7 +817,7 @@ build_def_use (basic_block bb) + OP_IN, 0); + + for (i = 0; i < recog_data.n_dups; i++) +- *recog_data.dup_loc[i] = copy_rtx (old_dups[i]); ++ *recog_data.dup_loc[i] = old_dups[i]; + for (i = 0; i < n_ops; i++) + *recog_data.operand_loc[i] = old_operands[i]; + if (recog_data.n_dups) diff --git a/toolchain/gcc/patches/4.3.2/400-arm_register_fix.patch b/toolchain/gcc/patches/4.3.2/400-arm_register_fix.patch new file mode 100644 index 000000000..2fb5aa627 --- /dev/null +++ b/toolchain/gcc/patches/4.3.2/400-arm_register_fix.patch @@ -0,0 +1,24 @@ +Fixes GCC PR36350 + +--- a/gcc/regrename.c ++++ b/gcc/regrename.c +@@ -783,6 +783,10 @@ build_def_use (basic_block bb) + recog_data.operand_type[i] = OP_INOUT; + } + ++ /* Unshare dup_loc RTL */ ++ for (i = 0; i < recog_data.n_dups; i++) ++ *recog_data.dup_loc[i] = copy_rtx(*recog_data.dup_loc[i]); ++ + /* Step 1: Close chains for which we have overlapping reads. */ + for (i = 0; i < n_ops; i++) + scan_rtx (insn, recog_data.operand_loc[i], +@@ -813,7 +817,7 @@ build_def_use (basic_block bb) + OP_IN, 0); + + for (i = 0; i < recog_data.n_dups; i++) +- *recog_data.dup_loc[i] = copy_rtx (old_dups[i]); ++ *recog_data.dup_loc[i] = old_dups[i]; + for (i = 0; i < n_ops; i++) + *recog_data.operand_loc[i] = old_operands[i]; + if (recog_data.n_dups) diff --git a/toolchain/gcc/patches/4.3.3/400-arm_register_fix.patch b/toolchain/gcc/patches/4.3.3/400-arm_register_fix.patch new file mode 100644 index 000000000..2fb5aa627 --- /dev/null +++ b/toolchain/gcc/patches/4.3.3/400-arm_register_fix.patch @@ -0,0 +1,24 @@ +Fixes GCC PR36350 + +--- a/gcc/regrename.c ++++ b/gcc/regrename.c +@@ -783,6 +783,10 @@ build_def_use (basic_block bb) + recog_data.operand_type[i] = OP_INOUT; + } + ++ /* Unshare dup_loc RTL */ ++ for (i = 0; i < recog_data.n_dups; i++) ++ *recog_data.dup_loc[i] = copy_rtx(*recog_data.dup_loc[i]); ++ + /* Step 1: Close chains for which we have overlapping reads. */ + for (i = 0; i < n_ops; i++) + scan_rtx (insn, recog_data.operand_loc[i], +@@ -813,7 +817,7 @@ build_def_use (basic_block bb) + OP_IN, 0); + + for (i = 0; i < recog_data.n_dups; i++) +- *recog_data.dup_loc[i] = copy_rtx (old_dups[i]); ++ *recog_data.dup_loc[i] = old_dups[i]; + for (i = 0; i < n_ops; i++) + *recog_data.operand_loc[i] = old_operands[i]; + if (recog_data.n_dups) -- cgit v1.2.3