* Fixed setting of image base using {$IMAGEBASE X} directive.

* Cleanup of relative code.

git-svn-id: trunk@13147 -

compiler/globals.pas

@@ -292,7 +292,6 @@ interface
 
     const
        DLLsource : boolean = false;
-       DLLImageBase : pshortstring = nil;
 
        { used to set all registers used for each global function
          this should dramatically decrease the number of
@@ -1350,8 +1349,6 @@ implementation
 
    procedure DoneGlobals;
      begin
-       if assigned(DLLImageBase) then
-         StringDispose(DLLImageBase);
        librarysearchpath.Free;
        unitsearchpath.Free;
        objectsearchpath.Free;

compiler/options.pas

@@ -1456,8 +1456,10 @@ begin
                           non relocatable DLL at a specific base address PM }
                         if (length(More)>j) then
                           begin
-                            if DLLImageBase=nil then
-                              DLLImageBase:=StringDup(Copy(More,j+1,255));
+                            val('$'+Copy(More,j+1,255),imagebase,code);
+                            if code<>0 then
+                              IllegalPara(opt);
+                            ImageBaseSetExplicity:=true;
                           end
                         else
                           begin

compiler/systems/t_symbian.pas

@@ -97,16 +97,10 @@ implementation
             begin
                 Concat('ENTRYNAME _E32Startup')
             end;
-            ibase:='';
-            if assigned(DLLImageBase) then
-              ibase:=DLLImageBase^
+            if IsSharedLibrary then
+              ibase:='10000000'
             else
-            begin
-                if IsSharedLibrary then
-                  ibase:='10000000'
-                else
-                    ibase:='400000';
-            end;
+                ibase:='400000';
             Concat('IMAGEBASE $' + ibase);
             Concat('HEADER');
             Concat('EXESECTION .text');

compiler/systems/t_win.pas

@@ -931,8 +931,7 @@ implementation
 
     procedure TInternalLinkerWin.DefaultLinkScript;
       var
-        s,s2,
-        ibase : TCmdStr;
+        s,s2 : TCmdStr;
         secname,
         secnames : string;
       begin
@@ -973,23 +972,20 @@ implementation
                 else
                   Concat('ENTRYNAME _mainCRTStartup');
               end;
-            ibase:='';
-            if assigned(DLLImageBase) then
-              ibase:=DLLImageBase^
-            else
+            if not ImageBaseSetExplicity then
               begin
                 if IsSharedLibrary then
-                  ibase:='10000000'
+                  imagebase:=$10000000
                 else
                   if target_info.system in system_wince then
-                    ibase:='10000'
+                    imagebase:=$10000
                   else
                     if target_info.system=system_x86_64_win64 then
-                      ibase:='100000000'
+                      imagebase:=$100000000
                     else
-                      ibase:='400000';
+                      imagebase:=$400000;
               end;
-            Concat('IMAGEBASE $' + ibase);
+            Concat('IMAGEBASE $' + hexStr(imagebase, SizeOf(imagebase)*2));
             Concat('HEADER');
             Concat('EXESECTION .text');
             Concat('  SYMBOL __text_start__');
@@ -1353,8 +1349,8 @@ implementation
           EntryStr:='--entry=_WinMainCRTStartup'
         else
           EntryStr:='--entry=_mainCRTStartup';
-        if assigned(DLLImageBase) then
-          ImageBaseStr:='--image-base=0x'+DLLImageBase^;
+        if ImageBaseSetExplicity then
+          ImageBaseStr:='--image-base=0x'+hexStr(imagebase, SizeOf(imagebase)*2);
         if (cs_link_strip in current_settings.globalswitches) then
           StripStr:='-s';
         if (cs_link_map in current_settings.globalswitches) then
@@ -1455,8 +1451,8 @@ implementation
           end
         else
           EntryStr:='--entry _DLLMainCRTStartup';
-        if assigned(DLLImageBase) then
-          ImageBaseStr:='--image-base=0x'+DLLImageBase^;
+        if ImageBaseSetExplicity then
+          ImageBaseStr:='--image-base=0x'+hexStr(imagebase, SizeOf(imagebase)*2);
         if (cs_link_strip in current_settings.globalswitches) then
           StripStr:='-s';
         if (cs_link_map in current_settings.globalswitches) then