--- ./plugins/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/DelegatingURLClassLoader.java.orig	2004-01-06 10:58:32.000000000 +0000
+++ ./plugins/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/DelegatingURLClassLoader.java	2004-01-06 10:59:35.000000000 +0000
@@ -41,7 +41,7 @@
 	// filter table
 	private Hashtable filterTable = new Hashtable();
 
-	// whether any URL is solib:
+	// whether any URL is gcjlib:
 	private boolean anySolibURL = false;
 
 	// development mode class path additions
@@ -271,7 +271,7 @@
 	resourcePath = mungeJarURLs(resourcePath);
 
 	for (int i = 0; i < codePath.length; ++i) {
-		if (codePath[i].getProtocol().equals("solib")) {
+		if (codePath[i].getProtocol().equals("gcjlib")) {
 			anySolibURL = true;
 			break;
 		}
--- ./plugins/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/InternalBootLoader.java.orig	2004-01-06 10:58:32.000000000 +0000
+++ ./plugins/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/InternalBootLoader.java	2004-01-06 10:59:45.000000000 +0000
@@ -376,7 +376,7 @@
 	File soFile = new File(baseDir, System.mapLibraryName(baseName));
 	if (! soFile.exists())
 		return null;
-	return "solib:" + soFile;
+	return "gcjlib:" + soFile;
 }
 
 private static Object[] getPlatformClassLoaderPath() {
--- ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/plugins/PluginDescriptor.java.orig	2004-01-06 10:58:32.000000000 +0000
+++ ./plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/plugins/PluginDescriptor.java	2004-01-06 11:00:00.000000000 +0000
@@ -52,7 +52,7 @@
 
 	// If this class was loaded from a shared library, then try to
 	// load other plugins as shared objects.
-	private static final boolean canUseSolib = PluginDescriptor.class.getProtectionDomain().getCodeSource().getLocation().getProtocol().equals("solib");
+	private static final boolean canUseSolib = PluginDescriptor.class.getProtectionDomain().getCodeSource().getLocation().getProtocol().equals("gcjlib");
 
 	// Places to look for library files 
 	private static String[] WS_JAR_VARIANTS = buildWSVariants();
--- ./plugins/org.eclipse.jdt.core/Makefile.orig	2004-01-06 11:01:20.230845328 +0000
+++ ./plugins/org.eclipse.jdt.core/Makefile	2004-01-06 09:56:54.000000000 +0000
@@ -302,7 +302,7 @@
 	$(GCJ) -c $(XGCJFLAGS) --resource $(shell echo $< | sed -e 's,^[^/]*/,,') -o $@ $<
 
 $(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared $(XGCJFLAGS) -o $(LIBRARY) $(OBJECTS) -l-org-apache-tools-1.5.2
+	$(GCJ) -shared $(XGCJFLAGS) -o $(LIBRARY) $(OBJECTS) -l-org-apache-tools-ant-1.5.2
 
 clean:
 	-rm -rf $(OBJECTS) $(LIBRARY)
--- ./plugins/org.eclipse.platform/src/org/eclipse/core/launcher/Main.java.orig	2004-01-06 10:58:32.000000000 +0000
+++ ./plugins/org.eclipse.platform/src/org/eclipse/core/launcher/Main.java	2004-01-06 11:00:23.000000000 +0000
@@ -397,10 +397,10 @@
 		url = null;
 		if ("file".equals(base.getProtocol())) {
 			URL	self = getClass().getProtectionDomain().getCodeSource().getLocation();
-			if (self.getProtocol().equals("solib")) {
+			if (self.getProtocol().equals("gcjlib")) {
 				File so = new File(base.getFile(), BOOTSO);
 				if (so.exists())
-					url = new URL("solib", "", so.toString());
+					url = new URL("gcjlib", "", so.toString());
 			}
 		}
 		if (url == null)
@@ -868,7 +868,7 @@
 	String path = decode(url.getFile());
 	path = new File(path).getAbsolutePath().replace(File.separatorChar,'/');
 	String protocol = url.getProtocol();
-	if (protocol.equals("solib")) {
+	if (protocol.equals("gcjlib")) {
 		path = path.substring(0, path.lastIndexOf("/")+1); //$NON-NLS-1$
 		protocol = "file";
 	} else if (path.endsWith(".jar")) //$NON-NLS-1$
--- ./gcjlauncher.java.orig	2004-01-06 10:58:32.000000000 +0000
+++ ./gcjlauncher.java	2004-01-06 10:58:56.000000000 +0000
@@ -75,7 +75,7 @@
 
 	String className = args[i++];
 
-	URL startupURL = new URL("solib", "", startup_so.toString());
+	URL startupURL = new URL("gcjlib", "", startup_so.toString());
 	URLClassLoader loader = new URLClassLoader(new URL[] { startupURL });
 
 	String[] rest = new String[args.length - i];