Libraries: collections bug fix

src/libraries/generics.collections/generics.collections.pas

@@ -629,9 +629,6 @@ type
     property Current: T read GetCurrent;
   end;
 
-  TCustomTree<TREE_CONSTRAINTS> = class
-  end;
-
   TTreeEnumerable<TTreeEnumerator, TTreePointersEnumerator,
     T, PT, PNode, TTree> = class abstract(TEnumerableWithPointers<T>)
   private

src/libraries/generics.collections/generics.hashes.pas

@@ -935,8 +935,14 @@ end;
   {$endif CPUX64}
 {$else}
   {$ifdef CPUX86}
-    {$define CPUINTEL}
-    {$ASMMODE INTEL}
+    {$ifndef FPC_PIC}
+      {$define CPUINTEL}
+      {$ASMMODE INTEL}
+    {$else}
+      { Assembler code uses references to static
+        variables with are not PIC ready }
+      {$define PUREPASCAL}
+    {$endif}
   {$else CPUX86}
   {$define PUREPASCAL}
   {$endif}
@@ -1057,7 +1063,7 @@ end;
 {$ifdef CPUX64}
 function xxHash32(crc: cardinal; P: Pointer; len: integer): cardinal;
 asm
-        {$ifdef LINUX} // crc=rdi P=rsi len=rdx
+        {$ifndef WIN64} // crc=rdi P=rsi len=rdx
         mov     r8, rdi
         mov     rcx, rsi
         {$else} // crc=r8 P=rcx len=rdx
@@ -1144,7 +1150,7 @@ asm
         shr     edx, 16
         xor     eax, edx
         pop     rbx
-        {$ifndef LINUX}
+        {$ifdef WIN64}
         pop     rdi
         pop     rsi
         {$endif}