paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-02-25 07:28:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r38126 into '.':

Browse Source 
G    packages/hermes/src/hermes.pp
--- Recording mergeinfo for merge of r38126 into '.':
 U   .
r38126 | pierre | 2018-02-06 10:41:40 +0100 (Tue, 06 Feb 2018) | 1 line

 Disable i386 assembler code if position independent code option is used

git-svn-id: branches/fixes_3_0@38247 -
This commit is contained in:
pierre 2018-02-16 10:29:50 +00:00
parent 8cd3c93f35
commit c97028ae1c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/hermes/src/hermes.pp
View File

@ -55,6 +55,14 @@ unit Hermes;
{$ENDIF}
interface
{$IF defined(cpui386) and defined(FPC_PIC)}
{ FPC_PIC is only set after parsing _INTERFFACE keyword
so we need to delay the test to here }
{ the i386 assembler code is not prepared for PIC code }
{$DEFINE noassembler}
{ Thus, disable assembler code in that case for now }
{$UNDEF I386_ASSEMBLER}
{$ENDIF}
const
HERMES_CONVERT_NORMAL = 0;