aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.6
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2013-08-07 00:47:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-08-07 00:47:57 +0000
commit34cef20a1108ff399ecbe13f42e1f6bc8c909b27 (patch)
tree0a251cfb7f7baa14673173048c8ff682c4bbed5d /gcc-4.6
parent32fce3edda831e36ee484406c39dffbe0230f257 (diff)
parenta3529b2d6b2bcc7136fd67e00e539301942e74d1 (diff)
downloadtoolchain_gcc-34cef20a1108ff399ecbe13f42e1f6bc8c909b27.zip
toolchain_gcc-34cef20a1108ff399ecbe13f42e1f6bc8c909b27.tar.gz
toolchain_gcc-34cef20a1108ff399ecbe13f42e1f6bc8c909b27.tar.bz2
Merge "Add an internal switch -minline-thumb1-jumptable to ARM gcc4.6/4.7/4.8"
Diffstat (limited to 'gcc-4.6')
-rw-r--r--gcc-4.6/gcc/config/arm/arm.h3
-rw-r--r--gcc-4.6/gcc/config/arm/arm.md2
-rw-r--r--gcc-4.6/gcc/config/arm/arm.opt4
-rw-r--r--gcc-4.6/gcc/config/arm/elf.h3
4 files changed, 9 insertions, 3 deletions
diff --git a/gcc-4.6/gcc/config/arm/arm.h b/gcc-4.6/gcc/config/arm/arm.h
index 9b0a834..b41f3a7 100644
--- a/gcc-4.6/gcc/config/arm/arm.h
+++ b/gcc-4.6/gcc/config/arm/arm.h
@@ -1965,10 +1965,11 @@ typedef struct
#define CASE_VECTOR_PC_RELATIVE (TARGET_THUMB2 \
|| (TARGET_THUMB1 \
+ && !inline_thumb1_jump_table \
&& (optimize_size || flag_pic)))
#define CASE_VECTOR_SHORTEN_MODE(min, max, body) \
- (TARGET_THUMB1 \
+ (TARGET_THUMB1 && !inline_thumb1_jump_table \
? (min >= 0 && max < 512 \
? (ADDR_DIFF_VEC_FLAGS (body).offset_unsigned = 1, QImode) \
: min >= -256 && max < 256 \
diff --git a/gcc-4.6/gcc/config/arm/arm.md b/gcc-4.6/gcc/config/arm/arm.md
index cc73aa2..5a50f87 100644
--- a/gcc-4.6/gcc/config/arm/arm.md
+++ b/gcc-4.6/gcc/config/arm/arm.md
@@ -8343,7 +8343,7 @@
(match_operand:SI 2 "const_int_operand" "") ; total range
(match_operand:SI 3 "" "") ; table label
(match_operand:SI 4 "" "")] ; Out of range label
- "TARGET_32BIT || optimize_size || flag_pic"
+ "TARGET_32BIT || ((optimize_size || flag_pic) && !inline_thumb1_jump_table)"
"
{
enum insn_code code;
diff --git a/gcc-4.6/gcc/config/arm/arm.opt b/gcc-4.6/gcc/config/arm/arm.opt
index a39bb3a..a7ab693 100644
--- a/gcc-4.6/gcc/config/arm/arm.opt
+++ b/gcc-4.6/gcc/config/arm/arm.opt
@@ -137,6 +137,10 @@ mthumb-interwork
Target Report Mask(INTERWORK)
Support calls between Thumb and ARM instruction sets
+minline-thumb1-jumptable
+Target Report Var(inline_thumb1_jump_table)
+Inline Thumb1 Jump table code
+
mtp=
Target RejectNegative Joined Var(target_thread_switch)
Specify how to access the thread pointer
diff --git a/gcc-4.6/gcc/config/arm/elf.h b/gcc-4.6/gcc/config/arm/elf.h
index 44d840b..cb84a59 100644
--- a/gcc-4.6/gcc/config/arm/elf.h
+++ b/gcc-4.6/gcc/config/arm/elf.h
@@ -104,7 +104,8 @@
the code more efficient, but for Thumb-1 it's better to put them out of
band unless we are generating compressed tables. */
#define JUMP_TABLES_IN_TEXT_SECTION \
- (TARGET_32BIT || (TARGET_THUMB && (optimize_size || flag_pic)))
+ (TARGET_32BIT || (TARGET_THUMB && !inline_thumb1_jump_table \
+ && (optimize_size || flag_pic)))
#ifndef LINK_SPEC
#define LINK_SPEC "%{mbig-endian:-EB} %{mlittle-endian:-EL} -X"