浏览代码

Disable i386 assembler code if position independent code option is used

git-svn-id: trunk@38126 -
pierre 7 年之前
父节点
当前提交
30e4988a4e
共有 1 个文件被更改,包括 8 次插入0 次删除
  1. 8 0
      packages/hermes/src/hermes.pp

+ 8 - 0
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;