Browse Source

* fixed compilation with -Cr after r13147
* changed type of minstacksize, maxstacksize and imagebase from aword
(= size of integer registers of the target platform) into puint
(= size of address space of target platform)

git-svn-id: trunk@13155 -

Jonas Maebe 16 years ago
parent
commit
4106ce540f
2 changed files with 3 additions and 1 deletions
  1. 1 1
      compiler/globals.pas
  2. 2 0
      compiler/systems/t_win.pas

+ 1 - 1
compiler/globals.pas

@@ -245,7 +245,7 @@ interface
        peflags : longint;
        minstacksize,
        maxstacksize,
-       imagebase : aword;
+       imagebase     : puint;
        UseDeffileForExports    : boolean;
        UseDeffileForExportsSetExplicitly : boolean;
        GenerateImportSection,

+ 2 - 0
compiler/systems/t_win.pas

@@ -980,9 +980,11 @@ implementation
                   if target_info.system in system_wince then
                     imagebase:=$10000
                   else
+{$ifdef cpu64bitaddr}
                     if target_info.system=system_x86_64_win64 then
                       imagebase:=$100000000
                     else
+{$endif}
                       imagebase:=$400000;
               end;
             Concat('IMAGEBASE $' + hexStr(imagebase, SizeOf(imagebase)*2));