From a3529b2d6b2bcc7136fd67e00e539301942e74d1 Mon Sep 17 00:00:00 2001 From: Lai Wei-Chih Date: Thu, 1 Aug 2013 15:09:46 +0800 Subject: Add an internal switch -minline-thumb1-jumptable to ARM gcc4.6/4.7/4.8 Default is off (ie. no changes of behavior), meaning that gcc may generate thumb1 jumptable helper calls (eg. __gnu_thumb1_case_sqi) for switch/case. Use -minline-thumb1-jumptable to compile code which can be linked with compiler-rt where helper __gnu_thumb1_case_* doesn't exist. This is mainly for use to compile NDK gabi++/stlport/libc++ to be independent of libgcc.a. The only affected binaries are all in armeabi. ABIs armeabi-v7a and x86/mips aren't affected. Size differences are libgabi++_static.a 176286 -> 176538 +0.1% libstlport_static.a 1406346 -> 1413318 +0.5% libc++_static.a 2426814 -> 2439074 +0.5% Change-Id: I582898955b28e53e988a91bc1a64b76fba677e58 --- gcc-4.7/gcc/config/arm/arm.h | 3 ++- gcc-4.7/gcc/config/arm/arm.md | 2 +- gcc-4.7/gcc/config/arm/arm.opt | 4 ++++ gcc-4.7/gcc/config/arm/elf.h | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'gcc-4.7') diff --git a/gcc-4.7/gcc/config/arm/arm.h b/gcc-4.7/gcc/config/arm/arm.h index 7ce48d13a..c82847fe2 100644 --- a/gcc-4.7/gcc/config/arm/arm.h +++ b/gcc-4.7/gcc/config/arm/arm.h @@ -1843,10 +1843,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.7/gcc/config/arm/arm.md b/gcc-4.7/gcc/config/arm/arm.md index fee20175f..d9a07ae8f 100644 --- a/gcc-4.7/gcc/config/arm/arm.md +++ b/gcc-4.7/gcc/config/arm/arm.md @@ -8755,7 +8755,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.7/gcc/config/arm/arm.opt b/gcc-4.7/gcc/config/arm/arm.opt index e03a16337..de60108bc 100644 --- a/gcc-4.7/gcc/config/arm/arm.opt +++ b/gcc-4.7/gcc/config/arm/arm.opt @@ -205,6 +205,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 + mtls-dialect= Target RejectNegative Joined Enum(tls_type) Var(target_tls_dialect) Init(TLS_GNU) Specify thread local storage scheme diff --git a/gcc-4.7/gcc/config/arm/elf.h b/gcc-4.7/gcc/config/arm/elf.h index 417adf8a2..f8bf4cf40 100644 --- a/gcc-4.7/gcc/config/arm/elf.h +++ b/gcc-4.7/gcc/config/arm/elf.h @@ -102,7 +102,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" -- cgit v1.2.3