From 71193c0f2cd002f8036c09a735b167cd83f6f657 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Wed, 18 Jul 2007 12:15:55 +0000
Subject: [PATCH]   * fixed  bootstrapping with 2.0.4   * fixed ppc64
 compilation (by reintroducing a bogus ptrint warning, that     code really is
 correct)

git-svn-id: trunk@8090 -
---
 compiler/cstreams.pas       | 4 ++--
 compiler/ppcgen/aasmcpu.pas | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/cstreams.pas b/compiler/cstreams.pas
index bf4a72235c..415345adab 100644
--- a/compiler/cstreams.pas
+++ b/compiler/cstreams.pas
@@ -462,7 +462,7 @@ begin
     begin
     Result:=FSize-FPosition;
     If Result>Count then Result:=Count;
-    Move (Pointer(PtrUInt(FMemory)+FPosition)^,Buffer,Result);
+    Move (Pointer(PtrUInt(FMemory)+PtrUInt(FPosition))^,Buffer,Result);
     FPosition:=Fposition+Result;
     end;
 end;
@@ -613,7 +613,7 @@ begin
       SetCapacity (NewPos);
     FSize:=Newpos;
     end;
-  System.Move (Buffer,Pointer(Ptruint(FMemory)+FPosition)^,Count);
+  System.Move (Buffer,Pointer(Ptruint(FMemory)+PtrUInt(FPosition))^,Count);
   FPosition:=NewPos;
   Result:=Count;
 end;
diff --git a/compiler/ppcgen/aasmcpu.pas b/compiler/ppcgen/aasmcpu.pas
index 6f80f3ad11..522ffe7c24 100644
--- a/compiler/ppcgen/aasmcpu.pas
+++ b/compiler/ppcgen/aasmcpu.pas
@@ -485,7 +485,7 @@ uses cutils, cclasses;
         p: tai;
         newjmp: taicpu;
         labelpositions: TFPList;
-        instrpos: ptruint;
+        instrpos: ptrint;
         l: tasmlabel;
         inserted_something: boolean;
       begin
@@ -539,7 +539,7 @@ uses cutils, cclasses;
 {$q-}
 {$define overflowon}
 {$endif}
-                           (ptruint(abs(ptruint(labelpositions[tasmlabel(taicpu(p).oper[0]^.ref^.symbol).labelnr]-instrpos)) - (low(smallint) div 4)) > ptruint((high(smallint) - low(smallint)) div 4)) then
+                           (ptruint(abs(ptrint(labelpositions[tasmlabel(taicpu(p).oper[0]^.ref^.symbol).labelnr]-instrpos)) - (low(smallint) div 4)) > ptruint((high(smallint) - low(smallint)) div 4)) then
 {$ifdef overflowon}
 {$q+}
 {$undef overflowon}