--- apache-ant-1.9.13/src/main/org/apache/tools/ant/types/CommandlineJava.java~	2018-10-23 19:19:07.242388770 +0200
+++ apache-ant-1.9.13/src/main/org/apache/tools/ant/types/CommandlineJava.java	2018-10-23 19:20:22.721860333 +0200
@@ -361,12 +361,10 @@
      */
     public String getClassname() {
         if (executableType != null) {
-            switch (executableType) {
-                case CLASS:
-                    return javaCommand.getExecutable();
-                case MODULE:
-                    return parseClassFromModuleClassPair(javaCommand.getExecutable());
-            }
+            if (executableType == ExecutableType.CLASS)
+                return javaCommand.getExecutable();
+            if (executableType == ExecutableType.MODULE)
+                return parseClassFromModuleClassPair(javaCommand.getExecutable());
         }
         return null;
     }
@@ -380,19 +378,17 @@
         if (executableType == null) {
             javaCommand.setExecutable(module);
         } else {
-            switch (executableType) {
-                case JAR:
-                    javaCommand.setExecutable(module, false);
-                    break;
-                case CLASS:
-                    javaCommand.setExecutable(createModuleClassPair(module,
+            if (executableType == ExecutableType.JAR)
+                javaCommand.setExecutable(module, false);
+            else if (executableType == ExecutableType.CLASS)
+                    javaCommand.setExecutable(createModuleClassPair(
+                            module,
                             javaCommand.getExecutable()), false);
-                    break;
-                case MODULE:
-                    javaCommand.setExecutable(createModuleClassPair(module,
-                            parseClassFromModuleClassPair(javaCommand.getExecutable())), false);
-                    break;
-            }
+            else if (executableType == ExecutableType.MODULE)
+                    javaCommand.setExecutable(createModuleClassPair(
+                            module,
+                            parseClassFromModuleClassPair(javaCommand.getExecutable())),
+                                              false);
         }
         executableType = ExecutableType.MODULE;
     }
--- apache-ant-1.9.13/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java~	2018-10-23 19:21:25.851454930 +0200
+++ apache-ant-1.9.13/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java	2018-10-23 19:23:45.339654702 +0200
@@ -1357,26 +1357,25 @@
             }
         }
 
-        switch (type) {
-            case STRING:
-                return expression;
-            case BOOLEAN:
-                return Boolean.parseBoolean(expression);
-            case DOUBLE:
-                return Double.parseDouble(expression);
-            case INT:
-                return Integer.parseInt(expression);
-            case LONG:
-                return Long.parseLong(expression);
-            default: // XPath expression
-                final QName xpathType = ParamType.XPATH_TYPES.get(type);
-                if (xpathType == null) {
-                    throw new IllegalArgumentException("Invalid XSLT parameter type: " + typeName);
-                } else {
-                    final XPathExpression xpe = xpath.compile(expression);
-                    // null = evaluate XPath on empty XML document
-                    return xpe.evaluate((Object) null, xpathType);
-                }
+        if (type == ParamType.STRING)
+            return expression;
+        if (type == ParamType.BOOLEAN)
+            return Boolean.parseBoolean(expression);
+        if (type == ParamType.DOUBLE)
+            return Double.parseDouble(expression);
+        if (type == ParamType.INT)
+            return Integer.parseInt(expression);
+        if (type == ParamType.LONG)
+            return Long.parseLong(expression);
+        else {
+            final QName xpathType = ParamType.XPATH_TYPES.get(type);
+            if (xpathType == null) {
+                throw new IllegalArgumentException("Invalid XSLT parameter type: " + typeName);
+            } else {
+                final XPathExpression xpe = xpath.compile(expression);
+                // null = evaluate XPath on empty XML document
+                return xpe.evaluate((Object) null, xpathType);
+            }
         }
     }
 
--- apache-ant-1.9.13/build.xml~	2018-10-23 19:24:41.606206236 +0200
+++ apache-ant-1.9.13/build.xml	2018-10-23 19:25:00.403063030 +0200
@@ -563,6 +563,7 @@
     <mkdir dir="${build.lib}"/>
 
     <javac srcdir="${java.dir}"
+           compiler="gcj"
            includeantruntime="false"
            destdir="${build.classes}"
            debug="${debug}"
@@ -1475,6 +1476,7 @@
     <mkdir dir="${build.tests}"/>
 
     <javac srcdir="${src.junit}"
+           compiler="gcj"
            includeantruntime="false"
            destdir="${build.tests}"
            debug="${debug}"