Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4

mcs/tools/sgen/ChangeLog

@@ -1,15 +0,0 @@
-2007-11-03  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* sgen.cs : handle /t option correctly. Exception handling.
-	  Patch by siokoshou ( http://d.hatena.ne.jp/siokoshou ).
-
-2006-11-14  Atsushi Enomoto  <atsushi@ximian.com>
-
-	* sgen.cs : some fixes.
-	  - catch Assembly.LoadFrom() errors.
-	  - command line options were working only with /, not with --.
-	  - --type (/t) are to limit target types, so skip non-target types.
-
-2004-07-10  Lluis Sanchez Gual  <lluis@novell.com>
-
-	* sgen.cs, Makefile, sgen.exe.sources: New files

mcs/tools/sgen/Makefile

@@ -2,7 +2,8 @@ thisdir = tools/sgen
 SUBDIRS = 
 include ../../build/rules.make
 
-LOCAL_MCS_FLAGS = -r:System.Xml.dll
+LOCAL_MCS_FLAGS =
+LIB_REFS = System.Xml System
 PROGRAM = sgen.exe
 
 include ../../build/executable.make

mcs/tools/sgen/sgen.cs

@@ -110,6 +110,9 @@ public class Driver
 						Console.WriteLine (" - Warning: ignoring '" + t + "'");
 						Console.WriteLine ("   " + ex.Message);
 					}
+				} catch (NotSupportedException ex) {
+					if (verbose)
+						Console.WriteLine (" - Warning: " + ex.Message);
 				}
 			}
 		} else {
@@ -128,6 +131,9 @@ public class Driver
 						Console.WriteLine (" - Warning: ignoring '" + type + "'");
 						Console.WriteLine ("   " + ex.Message);
 					}
+				} catch (NotSupportedException ex) {
+					if (verbose)
+						Console.WriteLine (" - Warning: " + ex.Message);
 				}
 			}
 		}