diff options
| author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-02-16 10:29:50 +0000 |
|---|---|---|
| committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-02-16 10:29:50 +0000 |
| commit | d82de046e305acd03f93c7829faf7479f500b513 (patch) | |
| tree | 7c6d00ca2e21e5a60c305613a442c2565babbbea | |
| parent | c09a7a312138a9b629687a497e5aeec25514962f (diff) | |
| download | fpc-d82de046e305acd03f93c7829faf7479f500b513.tar.gz | |
--- Merging r38126 into '.':
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: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@38247 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/hermes/src/hermes.pp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/hermes/src/hermes.pp b/packages/hermes/src/hermes.pp index ebd21f04d6..ef4ca372e8 100644 --- a/packages/hermes/src/hermes.pp +++ b/packages/hermes/src/hermes.pp @@ -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; |