Browse Source

* fixed compilation for i8086 with 2.6.x (it gave an unreachable code
warning)

git-svn-id: trunk@27358 -

Jonas Maebe 11 years ago
parent
commit
6b16c05a98
1 changed files with 8 additions and 11 deletions
  1. 8 11
      compiler/x86/nx86inl.pas

+ 8 - 11
compiler/x86/nx86inl.pas

@@ -234,19 +234,16 @@ implementation
      function tx86inlinenode.first_popcnt: tnode;
        begin
          Result:=nil;
-         if
-{$ifdef i8086}
-           true
-{$else i8086}
-           not(CPUX86_HAS_POPCNT in cpu_capabilities[current_settings.cputype])
-{$endif i8086}
-{$ifdef i386}
-           or is_64bit(left.resultdef)
-{$endif i386}
+{$ifndef i8086}
+         if (CPUX86_HAS_POPCNT in cpu_capabilities[current_settings.cputype])
+  {$ifdef i386}
+            and not is_64bit(left.resultdef)
+  {$endif i386}
            then
-           Result:=inherited first_popcnt
+             expectloc:=LOC_REGISTER
          else
-           expectloc:=LOC_REGISTER;
+{$endif not i8086}
+           Result:=inherited first_popcnt
        end;