diff options
| author | laksen <laksen@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-09-06 20:14:16 +0000 |
|---|---|---|
| committer | laksen <laksen@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-09-06 20:14:16 +0000 |
| commit | f22fd477a7dfe2b2d3a38a46b7c898679d5d1a3d (patch) | |
| tree | 56d122e8ad762b1bc495c4ddf84360c5923ea497 /rtl/arm | |
| parent | c37703190c2df1b4dc363185bd0452123ec83c66 (diff) | |
| download | fpc-f22fd477a7dfe2b2d3a38a46b7c898679d5d1a3d.tar.gz | |
Fix some minor UMULL, and FPv4_S16 define problems
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@31560 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'rtl/arm')
| -rw-r--r-- | rtl/arm/int64p.inc | 4 | ||||
| -rw-r--r-- | rtl/arm/mathu.inc | 2 | ||||
| -rw-r--r-- | rtl/arm/strings.inc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/rtl/arm/int64p.inc b/rtl/arm/int64p.inc index 5bb021d086..0190884b9a 100644 --- a/rtl/arm/int64p.inc +++ b/rtl/arm/int64p.inc @@ -13,7 +13,7 @@ **********************************************************************} -{$ifndef CPUTHUMB} +{$if (not defined(CPUTHUMB)) and defined(CPUARM_HAS_UMULL)} {$define FPC_SYSTEM_HAS_MUL_QWORD} function fpc_mul_qword(f1,f2 : qword;checkoverflow : longbool) : qword;assembler;nostackframe;[public,alias: 'FPC_MUL_QWORD']; compilerproc; asm @@ -62,5 +62,5 @@ asm .Lexit: ldmfd sp!,{r4,r5,r6,r15} end; -{$endif CPUTHUMB} +{$endif (not defined(CPUTHUMB)) and defined(CPUARM_HAS_UMULL)} diff --git a/rtl/arm/mathu.inc b/rtl/arm/mathu.inc index f41e0630c6..0242ab46e9 100644 --- a/rtl/arm/mathu.inc +++ b/rtl/arm/mathu.inc @@ -132,7 +132,7 @@ procedure ClearExceptions(RaisePending: Boolean =true); begin end; -{$elseif defined(darwin) or defined(FPUVFPV2) or defined(FPUVFPV3) or defined(FPUVFPV3_d16)} +{$elseif defined(darwin) or defined(FPUVFPV2) or defined(FPUVFPV3) or defined(FPUVFPV3_d16) or defined(FPUFPV4_s16)} const _VFP_ENABLE_IM = 1 shl 8; { invalid operation } diff --git a/rtl/arm/strings.inc b/rtl/arm/strings.inc index 7066439d3a..8a986818b3 100644 --- a/rtl/arm/strings.inc +++ b/rtl/arm/strings.inc @@ -28,7 +28,7 @@ asm {$if defined(cputhumb2)} it eq {$endif} -{$if defined(cpuarmv3) or defined(cpuarmv4)} +{$if not defined(CPUARM_HAS_BX)} moveq pc, lr {$else} bxeq lr @@ -58,7 +58,7 @@ asm {$if defined(cputhumb2)} it eq {$endif} -{$if defined(cpuarmv3) or defined(cpuarmv4)} +{$if not defined(CPUARM_HAS_BX)} moveq pc, lr {$else} bxeq lr |