--- a/make/autoconf/configure.ac	Tue Feb 27 00:04:54 2018 +0100
+++ b/make/autoconf/configure.ac	Tue Feb 27 00:07:16 2018 +0100
@@ -193,39 +193,6 @@
 # Configure flags for the tools
 FLAGS_SETUP_FLAGS
 
-#FIXME: REMOVE
-FLAGS_SORT_FLAGS(JVM_CFLAGS)
-FLAGS_SORT_FLAGS(CFLAGS_JDKLIB)
-FLAGS_SORT_FLAGS(CFLAGS_JDKEXE)
-FLAGS_SORT_FLAGS(CXXFLAGS_JDKLIB)
-FLAGS_SORT_FLAGS(CXXFLAGS_JDKEXE)
-FLAGS_SORT_FLAGS(JVM_LDFLAGS)
-FLAGS_SORT_FLAGS(LDFLAGS_JDKLIB)
-FLAGS_SORT_FLAGS(LDFLAGS_JDKEXE)
-FLAGS_SORT_FLAGS(JVM_CFLAGS)
-FLAGS_SORT_FLAGS(LDFLAGS_CXX_JDK)
-
-FLAGS_SORT_FLAGS(CFLAGS_TESTLIB)
-FLAGS_SORT_FLAGS(CXXFLAGS_TESTLIB)
-FLAGS_SORT_FLAGS(CFLAGS_TESTEXE)
-FLAGS_SORT_FLAGS(CXXFLAGS_TESTEXE)
-FLAGS_SORT_FLAGS(LDFLAGS_TESTLIB)
-FLAGS_SORT_FLAGS(LDFLAGS_TESTEXE)
-
-FLAGS_SORT_FLAGS(OPENJDK_BUILD_CFLAGS_JDKLIB)
-FLAGS_SORT_FLAGS(OPENJDK_BUILD_CXXFLAGS_JDKLIB)
-FLAGS_SORT_FLAGS(OPENJDK_BUILD_LDFLAGS_JDKLIB)
-FLAGS_SORT_FLAGS(OPENJDK_BUILD_CFLAGS_JDKEXE)
-FLAGS_SORT_FLAGS(OPENJDK_BUILD_CXXFLAGS_JDKEXE)
-FLAGS_SORT_FLAGS(OPENJDK_BUILD_LDFLAGS_JDKEXE)
-FLAGS_SORT_FLAGS(OPENJDK_BUILD_JVM_CFLAGS)
-FLAGS_SORT_FLAGS(OPENJDK_BUILD_JVM_LDFLAGS)
-
-FLAGS_SORT_FLAGS(JVM_ASFLAGS)
-FLAGS_SORT_FLAGS(JVM_LIBS)
-FLAGS_SORT_FLAGS(JDKLIB_LIBS)
-FLAGS_SORT_FLAGS(JDKEXE_LIBS)
-
 # Setup debug symbols (need objcopy from the toolchain for that)
 JDKOPT_SETUP_DEBUG_SYMBOLS
 JDKOPT_SETUP_CODE_COVERAGE

--- a/make/autoconf/flags.m4	Tue Feb 27 00:04:54 2018 +0100
+++ b/make/autoconf/flags.m4	Tue Feb 27 00:07:16 2018 +0100
@@ -27,13 +27,6 @@
 m4_include([flags-ldflags.m4])
 m4_include([flags-other.m4])
 
-# Sort the flags in a given variable, and remove superfluous whitespace.
-#
-# $1 = name of variable to sort
-AC_DEFUN([FLAGS_SORT_FLAGS], [
-  $1=`$ECHO ${$1} | $TR ' ' '\n' | $SORT | $TR '\n' ' '`
-])
-
 ################################################################################
 #
 # Setup ABI profile (for arm)