Merged revisions 786-787 via svnmerge from

/trunk

git-svn-id: branches/fixes_2_0@867 -

.gitattributes

@@ -124,7 +124,6 @@ compiler/i386/i386prop.inc svneol=native#text/plain
 compiler/i386/i386tab.inc svneol=native#text/plain
 compiler/i386/n386add.pas svneol=native#text/plain
 compiler/i386/n386cal.pas svneol=native#text/plain
-compiler/i386/n386cnv.pas svneol=native#text/plain
 compiler/i386/n386con.pas svneol=native#text/plain
 compiler/i386/n386inl.pas svneol=native#text/plain
 compiler/i386/n386mat.pas svneol=native#text/plain

compiler/i386/cpunode.pas

@@ -45,6 +45,7 @@ unit cpunode;
          after the generic one (FK)
        }
        nx86set,
+       nx86cnv,
 
        n386add,
        n386cal,
@@ -52,8 +53,7 @@ unit cpunode;
        n386mem,
        n386set,
        n386inl,
-       n386mat,
-       n386cnv
+       n386mat
        ;
 
 end.

compiler/i386/n386cnv.pas

@@ -1,70 +0,0 @@
-{
-    Copyright (c) 1998-2002 by Florian Klaempfl
-
-    Generate i386 assembler for type converting nodes
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- ****************************************************************************
-}
-unit n386cnv;
-
-{$i fpcdefs.inc}
-
-interface
-
-    uses
-      node,ncgcnv,defutil,defcmp,nx86cnv;
-
-    type
-       ti386typeconvnode = class(tx86typeconvnode)
-         protected
-         { procedure second_int_to_int;override; }
-         { procedure second_string_to_string;override; }
-         { procedure second_cstring_to_pchar;override; }
-         { procedure second_string_to_chararray;override; }
-         { procedure second_array_to_pointer;override; }
-         { procedure second_pointer_to_array;override; }
-         { procedure second_chararray_to_string;override; }
-         { procedure second_char_to_string;override; }
-         { function first_int_to_real: tnode; override; }
-         { procedure second_int_to_real;override; }
-         { procedure second_real_to_real;override; }
-         { procedure second_cord_to_pointer;override; }
-         { procedure second_proc_to_procvar;override; }
-         { procedure second_bool_to_int;override; }
-         { procedure second_int_to_bool;override; }
-         { procedure second_load_smallset;override;  }
-         { procedure second_ansistring_to_pchar;override; }
-         { procedure second_pchar_to_string;override; }
-         { procedure second_class_to_intf;override;  }
-         { procedure second_char_to_char;override; }
-       end;
-
-
-implementation
-
-   uses
-      verbose,systems,
-      symconst,symdef,aasmbase,aasmtai,aasmcpu,
-      cgbase,
-      ncon,ncal,ncnv,
-      cpubase,tgobj,
-      cgobj,cga,cgx86,ncgutil;
-
-
-begin
-   ctypeconvnode:=ti386typeconvnode;
-end.

compiler/x86/nx86cnv.pas

@@ -288,4 +288,6 @@ implementation
           end;
       end;
 
+begin
+  ctypeconvnode:=tx86typeconvnode
 end.