* revert previous commit. damn svnmerge needs revisions in ascending order :(

git-svn-id: branches/fixes_2_2@7574 -

compiler/link.pas

@@ -954,7 +954,6 @@ Implementation
         result:=false;
 
         Message1(exec_i_linking,outputname);
-        FlushOutput;
 
 {$warning TODO Load custom linker script}
         DefaultLinkScript;

compiler/ogcoff.pas

@@ -125,9 +125,6 @@ interface
        TCoffObjData = class(TObjData)
        private
          win32      : boolean;
-{$ifdef arm}
-         eVCobj     : boolean;
-{$endif arm}
        public
          constructor createcoff(const n:string;awin32:boolean;acObjSection:TObjSectionClass);
          destructor  destroy;override;
@@ -820,7 +817,7 @@ const pemagic : array[0..3] of byte = (
                   if (relocsec.objdata=objdata) then
                     dec(address,TCoffObjSection(relocsec).orgmempos);
 {$ifdef arm}
-                  if (relocsec.objdata=objdata) and not TCoffObjData(objdata).eVCobj then
+                  if (relocsec.objdata=objdata) then
                     inc(address, relocsec.MemPos)
                   else
 {$endif arm}
@@ -883,7 +880,7 @@ const pemagic : array[0..3] of byte = (
                         dec(address,TCoffObjSection(relocsec).orgmempos);
                     end;
 {$ifdef arm}
-                  if (relocsec.objdata=objdata) and not TCoffObjData(objdata).eVCobj then
+                  if (relocsec.objdata=objdata) then
                     inc(address, relocsec.MemPos)
                   else
 {$endif arm}
@@ -1766,9 +1763,6 @@ const pemagic : array[0..3] of byte = (
                InputError('Illegal COFF Magic');
                exit;
              end;
-{$ifdef arm}
-           eVCobj:=header.flag=$100;
-{$endif arm}
            { Strings }
            AReader.Seek(header.sympos+header.syms*sizeof(CoffSymbol));
            if not AReader.Read(strsize,4) then

rtl/wince/wininc/struct.inc

@@ -7127,7 +7127,7 @@
      TVSFIXEDFILEINFO = VS_FIXEDFILEINFO;
      PVSFIXEDFILEINFO = ^VS_FIXEDFILEINFO;
 
-     WIN32_FIND_DATAW = record
+     WIN32_FIND_DATA = record
           dwFileAttributes : DWORD;
           ftCreationTime : FILETIME;
           ftLastAccessTime : FILETIME;
@@ -7135,22 +7135,33 @@
           nFileSizeHigh : DWORD;
           nFileSizeLow : DWORD;
           dwOID: DWORD;
-          cFileName : array[0..MAX_PATH] of WCHAR;
+          cFileName : array[0..MAX_PATH] of TCHAR;
        end;
+     LPWIN32_FIND_DATA = ^WIN32_FIND_DATA;
+     PWIN32_FIND_DATA = ^WIN32_FIND_DATA;
+     _WIN32_FIND_DATA = WIN32_FIND_DATA;
+     TWIN32FINDDATA = WIN32_FIND_DATA;
+     TWIN32FINDDATAA = WIN32_FIND_DATA;
+     PWIN32FINDDATA = ^WIN32_FIND_DATA;
 
+     WIN32_FIND_DATAW = record
+          dwFileAttributes : DWORD;
+          ftCreationTime : FILETIME;
+          ftLastAccessTime : FILETIME;
+          ftLastWriteTime : FILETIME;
+          nFileSizeHigh : DWORD;
+          nFileSizeLow : DWORD;
+          dwReserved0 : DWORD;
+          dwReserved1 : DWORD;
+          cFileName : array[0..(MAX_PATH)-1] of WCHAR;
+          cAlternateFileName : array[0..13] of WCHAR;
+       end;
      LPWIN32_FIND_DATAW = ^WIN32_FIND_DATAW;
      PWIN32_FIND_DATAW = ^WIN32_FIND_DATAW;
      _WIN32_FIND_DATAW = WIN32_FIND_DATAW;
      TWIN32FINDDATAW = WIN32_FIND_DATAW;
      PWIN32FINDDATAW = ^WIN32_FIND_DATAW;
 
-     WIN32_FIND_DATA = WIN32_FIND_DATAW;
-     LPWIN32_FIND_DATA = ^WIN32_FIND_DATAW;
-     PWIN32_FIND_DATA = ^WIN32_FIND_DATAW;
-     _WIN32_FIND_DATA = WIN32_FIND_DATAW;
-     TWIN32FINDDATA = WIN32_FIND_DATAW;
-     PWIN32FINDDATA = ^WIN32_FIND_DATAW;
-
      WIN32_STREAM_ID = record
           dwStreamId : DWORD;
           dwStreamAttributes : DWORD;