[Clibinutils-svn-commit] SF.net SVN: clibinutils:[16] mono-based-binutils/trunk

[<tl...@us...>]

Revision: 16
          http://clibinutils.svn.sourceforge.net/clibinutils/?rev=16&view=rev
Author:   tlafage
Date:     2010-03-24 13:31:51 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
Remove code concerning Pnet ilasm.

Modified Paths:
--------------
    mono-based-binutils/trunk/ChangeLog
    mono-based-binutils/trunk/scripts/as.in
    mono-based-binutils/trunk/tools/gcc4cli/utils/CObject.cs

Modified: mono-based-binutils/trunk/ChangeLog
===================================================================
--- mono-based-binutils/trunk/ChangeLog	2010-03-23 10:11:07 UTC (rev 15)
+++ mono-based-binutils/trunk/ChangeLog	2010-03-24 13:31:51 UTC (rev 16)
@@ -1,3 +1,8 @@
+2010-03-24  Thierry LAFAGE  <thi...@in...>
+
+	* tools/gcc4cli/utils/CObject.cs: remove code concerning Pnet ilasm.
+	* scripts/as.in: remove code concerning Pnet ilasm.
+
 2010-03-23  Thierry LAFAGE  <thi...@in...>
 
 	* tools/gcc4cli/ld/Driver.cs: add "--runtime <rtversion>"

Modified: mono-based-binutils/trunk/scripts/as.in
===================================================================
--- mono-based-binutils/trunk/scripts/as.in	2010-03-23 10:11:07 UTC (rev 15)
+++ mono-based-binutils/trunk/scripts/as.in	2010-03-24 13:31:51 UTC (rev 16)
@@ -23,7 +23,7 @@
           shift
           ;;
       -o)
-          PARAM="$PARAM $1$2";
+          PARAM="$PARAM -output:$2";
           shift
           shift
           ;;
@@ -34,13 +34,7 @@
   esac
 done
 
-if test  "x`$ILASM --version | grep Mono | wc -l`" = "x0"; then
-    #needed by Pnet ilasm
-    PARAM=`echo "--format dll  $PARAM" | sed 's? -o? -o ?'`;
-else
-    #needed by Mono ilasm
-    PARAM=`echo "-dll -quiet $PARAM" | sed 's? -o? -output:?'`;
-fi
+PARAM="-dll -quiet $PARAM"
 
 CMD="$ILASM $PARAM"
 if test -n "$VERBOSE"; then

Modified: mono-based-binutils/trunk/tools/gcc4cli/utils/CObject.cs
===================================================================
--- mono-based-binutils/trunk/tools/gcc4cli/utils/CObject.cs	2010-03-23 10:11:07 UTC (rev 15)
+++ mono-based-binutils/trunk/tools/gcc4cli/utils/CObject.cs	2010-03-24 13:31:51 UTC (rev 16)
@@ -15,8 +15,6 @@
         {
             MainType = Module.Types["<Module>"];
             FillTables ();
-            if (ref_types.Contains ("<ModuleExtern>"))
-                fix_DOTGNU_Errors ();
         }
 
         internal CObject (string name, AssemblyResolver asm_resolver)
@@ -30,30 +28,6 @@
             Module.Types.Add (MainType);
         }
 
-        void fix_DOTGNU_Errors ()
-        {
-            foreach (MethodDefinition method in MainType.Methods) {
-                foreach (Instruction instr in method.Body.Instructions) {
-                    if (   instr.OpCode.OperandType == OperandType.InlineMethod
-                        || (instr.OpCode.OperandType == OperandType.InlineTok && instr.Operand is MethodReference)) {
-                        MethodReference mref = instr.Operand as MethodReference;
-                        if (mref.DeclaringType.Name == "<ModuleExtern>") {
-                            string m_name = mref.Name;
-                            if (def_symbols.Contains (m_name)) {
-                                mref.DeclaringType = ((MethodReference)def_symbols[m_name]).DeclaringType;
-                            }
-                            else if (private_symbols.Contains (m_name)) {
-                                mref.DeclaringType = ((MethodReference)private_symbols[m_name]).DeclaringType;
-                            }
-                            else
-                                throw new Exception ("Error in hack for DOTGNU");
-                        }
-                    }
-                }
-            }
-            ref_types.Remove ("<ModuleExtern>");
-        }
-
         static int renamer_id = 0;
 
         bool MethodIsVarArg(MethodReference method)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.