aboutsummaryrefslogtreecommitdiff
path: root/arm-link.c
diff options
context:
space:
mode:
authorgrischka <grischka>2017-05-13 08:59:06 +0200
committergrischka <grischka>2017-05-13 08:59:06 +0200
commit28435ec58c2ef9bb571cad5f8a1129aea3ecc204 (patch)
treea08b77f90c9c24972e0fccd6c223af73b5b240f6 /arm-link.c
parent3a9d6b3655bd15e752e65a4f0f23f64f4ec56fe1 (diff)
downloadtinycc-28435ec58c2ef9bb571cad5f8a1129aea3ecc204.tar.gz
tinycc-28435ec58c2ef9bb571cad5f8a1129aea3ecc204.tar.bz2
configure: --config-musl/-uClibc switch & misc cleanups
- configure: - add --config-uClibc,-musl switch and suggest to use it if uClibc/musl is detected - make warning options magic clang compatible - simplify (use $confvars instead of individual options) - Revert "Remove some unused-parameter lint" 7443db0d5f841b81a55e918bf8c228dd20f9ddb2 rather use -Wno-unused-parameter (or just not -Wextra) - #ifdef functions that are unused on some targets - tccgen.c: use PTR_SIZE==8 instead of (X86_64 || ARM64) - tccpe.c: fix some warnings - integrate dummy arm-asm better
Diffstat (limited to 'arm-link.c')
-rw-r--r--arm-link.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arm-link.c b/arm-link.c
index 606f40e..aee35af 100644
--- a/arm-link.c
+++ b/arm-link.c
@@ -190,7 +190,7 @@ void relocate(TCCState *s1, ElfW_Rel *rel, int type, unsigned char *ptr, addr_t
if (x & 0x800000)
x -= 0x1000000;
x <<= 2;
- blx_avail = (TCC_ARM_VERSION >= 5);
+ blx_avail = (TCC_CPU_VERSION >= 5);
is_thumb = val & 1;
is_bl = (*(unsigned *) ptr) >> 24 == 0xeb;
is_call = (type == R_ARM_CALL || (type == R_ARM_PC24 && is_bl));