From 30e4988a4e1a17234fddf4c2fb69bd3e7a7281ab Mon Sep 17 00:00:00 2001 From: pierre Date: Tue, 6 Feb 2018 09:41:40 +0000 Subject: [PATCH] Disable i386 assembler code if position independent code option is used git-svn-id: trunk@38126 - --- packages/hermes/src/hermes.pp | 8 ++++++++ 1 file changed, 8 insertions(+) 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;