# HG changeset patch
# User ihse
# Date 1519644603 -3600
# Node ID 4ebba44845d651d4005d2ea82ccdf4efc43d58eb
# Parent  d70e19fc211f19cea1dfb2209783990a2a9d2ee5
More sorting, fix solstudio bug.

diff -r d70e19fc211f -r 4ebba44845d6 make/autoconf/configure.ac
--- a/make/autoconf/configure.ac	Mon Feb 26 10:56:18 2018 +0100
+++ b/make/autoconf/configure.ac	Mon Feb 26 12:30:03 2018 +0100
@@ -225,6 +225,11 @@
 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
diff -r d70e19fc211f -r 4ebba44845d6 make/autoconf/flags.m4
--- a/make/autoconf/flags.m4	Mon Feb 26 10:56:18 2018 +0100
+++ b/make/autoconf/flags.m4	Mon Feb 26 12:30:03 2018 +0100
@@ -436,6 +436,7 @@
 
    ############## ASFLAGS
 
+  # FIXME: This should be CPU dependent...
   # Set JVM_ASFLAGS
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     JVM_ASFLAGS="-x assembler-with-cpp -mno-omit-leaf-frame-pointer -mstack-alignment=16"
@@ -564,7 +565,7 @@
       TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing" # technically NOT for CXX
     fi
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
-    TOOLCHAIN_CFLAGS_JDK="mt"
+    TOOLCHAIN_CFLAGS_JDK="-mt"
     TOOLCHAIN_CFLAGS_JDK_CONLY="-xc99=%none -xCC -Xa -v -W0,-noglobal" # C only
     TOOLCHAIN_CFLAGS_JDK_CXXONLY="-features=no%except -norunpath -xnolib" # CXX only
     TOOLCHAIN_CFLAGS_JVM="-template=no%extdef -features=no%split_init \