Merge forgotten go32v2 2.6.0 branch changes back into trunk.

  * Change it also in TInternalLinkerGo32v2.DefaultLinkScript method.
------------------------------------------------------------------------
r20578 | pierre | 2012-03-22 17:34:35 +0100 (Thu, 22 Mar 2012) | 1 line

 Force _environ to be the same as __environ
------------------------------------------------------------------------

git-svn-id: trunk@24229 -

compiler/systems/t_go32v2.pas

@@ -137,7 +137,7 @@ implementation
             Concat('  OBJSECTION .dtors');
             Concat('  SYMBOL djgpp_last_dtor');
             Concat('  SYMBOL __environ');
-            Concat('  PROVIDE _environ');
+            Concat('  SYMBOL _environ');
             Concat('  LONG 0');
             Concat('  OBJSECTION .data*');
             Concat('  OBJSECTION .fpc*');
@@ -309,11 +309,14 @@ begin
   ScriptRes.Add('      *(.dtors)');
   ScriptRes.Add('      djgpp_last_dtor = . ;');
   ScriptRes.Add('      __environ = . ;');
-  ScriptRes.Add('      PROVIDE(_environ = .);');
+  ScriptRes.Add('      _environ = .;');
   ScriptRes.Add('      LONG(0)');
+  ScriptRes.Add('      . = ALIGN(0x20);');
   ScriptRes.Add('      *(.data)');
   ScriptRes.Add('      *(.data.*)');
+  ScriptRes.Add('      . = ALIGN(0x20);');
   ScriptRes.Add('      *(.fpc*)');
+  ScriptRes.Add('      . = ALIGN(0x20);');
   ScriptRes.Add('      *(.gcc_exc)');
   ScriptRes.Add('      ___EH_FRAME_BEGIN__ = . ;');
   ScriptRes.Add('      *(.eh_fram*)');