*** old/make/conf/jib-profiles.js	Mon Sep 17 10:29:24 2018
--- new/make/conf/jib-profiles.js	Mon Sep 17 10:29:23 2018

*** 231,242 ****
--- 231,241 ----
  
      // List of the main profile names used for iteration
      common.main_profile_names = [
          "linux-x64", "linux-x86", "macosx-x64", "solaris-x64",
          "solaris-sparcv9", "windows-x64", "windows-x86",
-         "linux-aarch64", "linux-arm32", "linux-arm64", "linux-arm-vfp-hflt",
          "linux-arm-vfp-hflt-dyn"
      ];
  
      // These are the base setttings for all the main build profiles.
      common.main_profile_base = {
          dependencies: ["boot_jdk", "gnumake", "jtreg", "jib", "autoconf"],

*** 438,461 ****
--- 437,447 ----
              target_cpu: "aarch64",
              build_cpu: "x64",
              dependencies: ["devkit", "build_devkit", "cups"],
              configure_args: [
                  "--openjdk-target=aarch64-linux-gnu", "--with-freetype=bundled",
-                 "--disable-warnings-as-errors", "--with-cpu-port=aarch64",
              ],
          },
  
          "linux-arm64": {
              target_os: "linux",
              target_cpu: "aarch64",
              build_cpu: "x64",
              dependencies: ["devkit", "build_devkit", "cups", "headless_stubs"],
              configure_args: [
                  "--with-cpu-port=arm64",
                  "--with-jvm-variants=server",
                  "--openjdk-target=aarch64-linux-gnu",
                  "--enable-headless-only"
              ],
          },
  
          "linux-arm32": {
              target_os: "linux",

*** 465,498 ****
--- 451,461 ----
              configure_args: [
                  "--openjdk-target=arm-linux-gnueabihf", "--with-freetype=bundled",
                  "--with-abi-profile=arm-vfp-hflt", "--disable-warnings-as-errors"
              ],
          },
  
          "linux-arm-vfp-hflt": {
              target_os: "linux",
              target_cpu: "arm",
              build_cpu: "x64",
              dependencies: ["devkit", "build_devkit", "cups"],
              configure_args: [
                  "--with-jvm-variants=minimal1,client",
                  "--with-x=" + input.get("devkit", "install_path") + "/arm-linux-gnueabihf/libc/usr/X11R6-PI",
                  "--with-fontconfig=" + input.get("devkit", "install_path") + "/arm-linux-gnueabihf/libc/usr/X11R6-PI",
                  "--openjdk-target=arm-linux-gnueabihf",
                  "--with-abi-profile=arm-vfp-hflt",
                  "--with-freetype=bundled"
              ],
          },
  
          // Special version of the SE profile adjusted to be testable on arm64 hardware.
          "linux-arm-vfp-hflt-dyn": {
              configure_args: "--with-stdc++lib=dynamic"
          }
      };
      // Let linux-arm-vfp-hflt-dyn inherit everything from linux-arm-vfp-hflt
      profiles["linux-arm-vfp-hflt-dyn"] = concatObjects(
          profiles["linux-arm-vfp-hflt-dyn"], profiles["linux-arm-vfp-hflt"]);
  
      // Add the base settings to all the main profiles
      common.main_profile_names.forEach(function (name) {
          profiles[name] = concatObjects(common.main_profile_base, profiles[name]);
      });

*** 616,634 ****
--- 579,588 ----
         "linux-aarch64": {
              platform: "linux-aarch64",
          },
         "linux-arm32": {
              platform: "linux-arm32",
          },
         "linux-arm64": {
              platform: "linux-arm64-vfp-hflt",
          },
          "linux-arm-vfp-hflt": {
              platform: "linux-arm32-vfp-hflt",
          },
          "linux-arm-vfp-hflt-dyn": {
              platform: "linux-arm32-vfp-hflt-dyn",
          }
      }
      // Generate common artifacts for all main profiles
      Object.keys(artifactData).forEach(function (name) {
          profiles[name] = concatObjects(profiles[name],

*** 840,859 ****
--- 794,805 ----
          linux_x64: "gcc7.3.0-OEL6.4+1.0",
          macosx_x64: "Xcode9.4-MacOSX10.13+1.0",
          solaris_x64: "SS12u4-Solaris11u1+1.0",
          solaris_sparcv9: "SS12u4-Solaris11u1+1.1",
          windows_x64: "VS2017-15.5.5+1.0",
!         linux_aarch64: (input.profile != null && input.profile.indexOf("arm64") >= 0
!                     ? "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0"
                      : "gcc7.3.0-Fedora27+1.0"),
          linux_arm: (input.profile != null && input.profile.indexOf("hflt") >= 0
                      ? "gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux+1.0"
                      : (input.profile.indexOf("arm32") >= 0
                         ? "gcc7.3.0-Fedora27+1.0"
                         : "arm-linaro-4.7+1.0"
                         )
                      )
!         linux_aarch64: "gcc7.3.0-Fedora27+1.0",
!         linux_arm: "gcc7.3.0-Fedora27+1.0"
      };
  
      var devkit_platform = (input.target_cpu == "x86"
          ? input.target_os + "_x64"
          : input.target_platform);