changeset 2422:05ac48290793

Merge
author jwilhelm
date Thu, 08 Dec 2016 17:13:07 +0100
parents e7c91db2cd25 c14f9a7b4cab
children 299f3e9ed163
files common/autoconf/buildjdk-spec.gmk.in common/autoconf/flags.m4 common/autoconf/generated-configure.sh common/autoconf/platform.m4 common/autoconf/spec.gmk.in common/bin/compare_exceptions.sh.incl make/common/MakeBase.gmk
diffstat 8 files changed, 131 insertions(+), 202 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/buildjdk-spec.gmk.in	Thu Dec 08 16:18:03 2016 +0100
+++ b/common/autoconf/buildjdk-spec.gmk.in	Thu Dec 08 17:13:07 2016 +0100
@@ -50,8 +50,6 @@
 
 OPENJDK_BUILD_CPU_LEGACY := @OPENJDK_BUILD_CPU_LEGACY@
 OPENJDK_BUILD_CPU_LEGACY_LIB := @OPENJDK_BUILD_CPU_LEGACY_LIB@
-OPENJDK_BUILD_CPU_LIBDIR := @OPENJDK_BUILD_CPU_LIBDIR@
-OPENJDK_TARGET_CPU_LIBDIR := @OPENJDK_BUILD_CPU_LIBDIR@
 OPENJDK_TARGET_CPU := @OPENJDK_BUILD_CPU@
 OPENJDK_TARGET_CPU_ARCH := @OPENJDK_BUILD_CPU_ARCH@
 OPENJDK_TARGET_CPU_BITS := @OPENJDK_BUILD_CPU_BITS@
--- a/common/autoconf/compare.sh.in	Thu Dec 08 16:18:03 2016 +0100
+++ b/common/autoconf/compare.sh.in	Thu Dec 08 17:13:07 2016 +0100
@@ -33,7 +33,6 @@
 
 export OPENJDK_TARGET_OS="@OPENJDK_TARGET_OS@"
 export OPENJDK_TARGET_CPU="@OPENJDK_TARGET_CPU@"
-export OPENJDK_TARGET_CPU_LIBDIR="@OPENJDK_TARGET_CPU_LIBDIR@"
 export DEBUG_LEVEL="@DEBUG_LEVEL@"
 
 export AWK="@AWK@"
--- a/common/autoconf/flags.m4	Thu Dec 08 16:18:03 2016 +0100
+++ b/common/autoconf/flags.m4	Thu Dec 08 17:13:07 2016 +0100
@@ -1160,7 +1160,7 @@
     $2JDKLIB_LIBS=""
   else
     $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
-        -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)"
+        -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base"
 
     if test "x$1" = "xTARGET"; then
       # On some platforms (mac) the linker warns about non existing -L dirs.
@@ -1170,15 +1170,15 @@
       if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \
           || HOTSPOT_CHECK_JVM_VARIANT(minimal); then
         $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
-            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/$JVM_VARIANT_MAIN"
+            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$JVM_VARIANT_MAIN"
       else
         $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
-            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
+            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
       fi
     elif test "x$1" = "xBUILD"; then
       # When building a buildjdk, it's always only the server variant
       $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
-          -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
+          -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
     fi
 
     $2JDKLIB_LIBS="-ljava -ljvm"
--- a/common/autoconf/generated-configure.sh	Thu Dec 08 16:18:03 2016 +0100
+++ b/common/autoconf/generated-configure.sh	Thu Dec 08 17:13:07 2016 +0100
@@ -980,10 +980,8 @@
 OPENJDK_BUILD_CPU_BUNDLE
 OPENJDK_BUILD_OS_BUNDLE
 OPENJDK_BUILD_OS_EXPORT_DIR
-OPENJDK_BUILD_CPU_JLI_CFLAGS
 OPENJDK_BUILD_CPU_OSARCH
 OPENJDK_BUILD_CPU_ISADIR
-OPENJDK_BUILD_CPU_LIBDIR
 OPENJDK_BUILD_CPU_LEGACY_LIB
 OPENJDK_BUILD_CPU_LEGACY
 HOTSPOT_TARGET_CPU_DEFINE
@@ -997,10 +995,8 @@
 OPENJDK_TARGET_CPU_BUNDLE
 OPENJDK_TARGET_OS_BUNDLE
 OPENJDK_TARGET_OS_EXPORT_DIR
-OPENJDK_TARGET_CPU_JLI_CFLAGS
 OPENJDK_TARGET_CPU_OSARCH
 OPENJDK_TARGET_CPU_ISADIR
-OPENJDK_TARGET_CPU_LIBDIR
 OPENJDK_TARGET_CPU_LEGACY_LIB
 OPENJDK_TARGET_CPU_LEGACY
 REQUIRED_OS_VERSION
@@ -5086,7 +5082,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1481210228
+DATE_WHEN_GENERATED=1481213545
 
 ###############################################################################
 #
@@ -15788,15 +15784,6 @@
   fi
 
 
-  # This is the name of the cpu (but using i386 and amd64 instead of
-  # x86 and x86_64, respectively), preceeded by a /, to be used when
-  # locating libraries. On macosx, it's empty, though.
-  OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    OPENJDK_TARGET_CPU_LIBDIR=""
-  fi
-
-
   # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
   # /amd64 or /sparcv9. This string is appended to some library paths, like this:
   # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
@@ -15828,16 +15815,6 @@
     # On all platforms except macosx, we replace x86_64 with amd64.
     OPENJDK_TARGET_CPU_JLI="amd64"
   fi
-  # Now setup the -D flags for building libjli.
-  OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
-  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
-    if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
-      OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
-    elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
-      OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
-    fi
-  fi
-
 
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
       OPENJDK_TARGET_OS_EXPORT_DIR=macosx
@@ -15963,15 +15940,6 @@
   fi
 
 
-  # This is the name of the cpu (but using i386 and amd64 instead of
-  # x86 and x86_64, respectively), preceeded by a /, to be used when
-  # locating libraries. On macosx, it's empty, though.
-  OPENJDK_BUILD_CPU_LIBDIR="/$OPENJDK_BUILD_CPU_LEGACY_LIB"
-  if test "x$OPENJDK_BUILD_OS" = xmacosx; then
-    OPENJDK_BUILD_CPU_LIBDIR=""
-  fi
-
-
   # OPENJDK_BUILD_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
   # /amd64 or /sparcv9. This string is appended to some library paths, like this:
   # /usr/lib${OPENJDK_BUILD_CPU_ISADIR}/libexample.so
@@ -16003,16 +15971,6 @@
     # On all platforms except macosx, we replace x86_64 with amd64.
     OPENJDK_BUILD_CPU_JLI="amd64"
   fi
-  # Now setup the -D flags for building libjli.
-  OPENJDK_BUILD_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_BUILD_CPU_JLI\"'"
-  if test "x$OPENJDK_BUILD_OS" = xsolaris; then
-    if test "x$OPENJDK_BUILD_CPU_ARCH" = xsparc; then
-      OPENJDK_BUILD_CPU_JLI_CFLAGS="$OPENJDK_BUILD_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
-    elif test "x$OPENJDK_BUILD_CPU_ARCH" = xx86; then
-      OPENJDK_BUILD_CPU_JLI_CFLAGS="$OPENJDK_BUILD_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
-    fi
-  fi
-
 
   if test "x$OPENJDK_BUILD_OS" = xmacosx; then
       OPENJDK_BUILD_OS_EXPORT_DIR=macosx
@@ -50376,7 +50334,7 @@
     JDKLIB_LIBS=""
   else
     JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
-        -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)"
+        -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base"
 
     if test "xTARGET" = "xTARGET"; then
       # On some platforms (mac) the linker warns about non existing -L dirs.
@@ -50386,15 +50344,15 @@
       if   [[ " $JVM_VARIANTS " =~ " server " ]]   ||   [[ " $JVM_VARIANTS " =~ " client " ]]   \
           ||   [[ " $JVM_VARIANTS " =~ " minimal " ]]  ; then
         JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
-            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/$JVM_VARIANT_MAIN"
+            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$JVM_VARIANT_MAIN"
       else
         JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
-            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server"
+            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
       fi
     elif test "xTARGET" = "xBUILD"; then
       # When building a buildjdk, it's always only the server variant
       JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
-          -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server"
+          -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
     fi
 
     JDKLIB_LIBS="-ljava -ljvm"
@@ -51198,7 +51156,7 @@
     OPENJDK_BUILD_JDKLIB_LIBS=""
   else
     OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \
-        -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)"
+        -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base"
 
     if test "xBUILD" = "xTARGET"; then
       # On some platforms (mac) the linker warns about non existing -L dirs.
@@ -51208,15 +51166,15 @@
       if   [[ " $JVM_VARIANTS " =~ " server " ]]   ||   [[ " $JVM_VARIANTS " =~ " client " ]]   \
           ||   [[ " $JVM_VARIANTS " =~ " minimal " ]]  ; then
         OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \
-            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/$JVM_VARIANT_MAIN"
+            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/$JVM_VARIANT_MAIN"
       else
         OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \
-            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server"
+            -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
       fi
     elif test "xBUILD" = "xBUILD"; then
       # When building a buildjdk, it's always only the server variant
       OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \
-          -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server"
+          -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/server"
     fi
 
     OPENJDK_BUILD_JDKLIB_LIBS="-ljava -ljvm"
--- a/common/autoconf/platform.m4	Thu Dec 08 16:18:03 2016 +0100
+++ b/common/autoconf/platform.m4	Thu Dec 08 17:13:07 2016 +0100
@@ -308,15 +308,6 @@
   fi
   AC_SUBST(OPENJDK_$1_CPU_LEGACY_LIB)
 
-  # This is the name of the cpu (but using i386 and amd64 instead of
-  # x86 and x86_64, respectively), preceeded by a /, to be used when
-  # locating libraries. On macosx, it's empty, though.
-  OPENJDK_$1_CPU_LIBDIR="/$OPENJDK_$1_CPU_LEGACY_LIB"
-  if test "x$OPENJDK_$1_OS" = xmacosx; then
-    OPENJDK_$1_CPU_LIBDIR=""
-  fi
-  AC_SUBST(OPENJDK_$1_CPU_LIBDIR)
-
   # OPENJDK_$1_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
   # /amd64 or /sparcv9. This string is appended to some library paths, like this:
   # /usr/lib${OPENJDK_$1_CPU_ISADIR}/libexample.so
@@ -348,16 +339,6 @@
     # On all platforms except macosx, we replace x86_64 with amd64.
     OPENJDK_$1_CPU_JLI="amd64"
   fi
-  # Now setup the -D flags for building libjli.
-  OPENJDK_$1_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_$1_CPU_JLI\"'"
-  if test "x$OPENJDK_$1_OS" = xsolaris; then
-    if test "x$OPENJDK_$1_CPU_ARCH" = xsparc; then
-      OPENJDK_$1_CPU_JLI_CFLAGS="$OPENJDK_$1_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
-    elif test "x$OPENJDK_$1_CPU_ARCH" = xx86; then
-      OPENJDK_$1_CPU_JLI_CFLAGS="$OPENJDK_$1_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
-    fi
-  fi
-  AC_SUBST(OPENJDK_$1_CPU_JLI_CFLAGS)
 
   if test "x$OPENJDK_$1_OS" = xmacosx; then
       OPENJDK_$1_OS_EXPORT_DIR=macosx
--- a/common/autoconf/spec.gmk.in	Thu Dec 08 16:18:03 2016 +0100
+++ b/common/autoconf/spec.gmk.in	Thu Dec 08 17:13:07 2016 +0100
@@ -75,11 +75,9 @@
 
 # Legacy support
 OPENJDK_TARGET_CPU_ISADIR:=@OPENJDK_TARGET_CPU_ISADIR@
-OPENJDK_TARGET_CPU_LIBDIR:=@OPENJDK_TARGET_CPU_LIBDIR@
 OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
 OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
 OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
-OPENJDK_TARGET_CPU_JLI_CFLAGS:=@OPENJDK_TARGET_CPU_JLI_CFLAGS@
 OPENJDK_TARGET_OS_EXPORT_DIR:=@OPENJDK_TARGET_OS_EXPORT_DIR@
 
 HOTSPOT_TARGET_OS := @HOTSPOT_TARGET_OS@
--- a/common/bin/compare_exceptions.sh.incl	Thu Dec 08 16:18:03 2016 +0100
+++ b/common/bin/compare_exceptions.sh.incl	Thu Dec 08 17:13:07 2016 +0100
@@ -57,21 +57,21 @@
       ./demo/jvmti/mtrace/lib/libmtrace.so
       ./demo/jvmti/versionCheck/lib/libversionCheck.so
       ./demo/jvmti/waiters/lib/libwaiters.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/client/libjsig.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/client/libjvm.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/libattach.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/libdt_socket.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/libinstrument.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/libjsdt.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/libjsig.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/libmanagement.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/libnet.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/libnpt.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/libverify.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjsig.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/server/libjsig.so
-      ./lib$OPENJDK_TARGET_CPU_LIBDIR/server/libjvm.so
+      ./lib/client/libjsig.so
+      ./lib/client/libjvm.so
+      ./lib/libattach.so
+      ./lib/libdt_socket.so
+      ./lib/libinstrument.so
+      ./lib/libjsdt.so
+      ./lib/libjsig.so
+      ./lib/libmanagement.so
+      ./lib/libnet.so
+      ./lib/libnpt.so
+      ./lib/libverify.so
+      ./lib/minimal/libjsig.so
+      ./lib/minimal/libjvm.so
+      ./lib/server/libjsig.so
+      ./lib/server/libjvm.so
       ./bin/appletviewer
       ./bin/idlj
       ./bin/jar
@@ -122,12 +122,12 @@
     # So for now, accept the difference but put a limit on the size. The
     # different order of functions shouldn't result in a very big diff.
     KNOWN_FULLDUMP_DIFF="
-        ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
+        ./lib/minimal/libjvm.so
         "
 
     # Link time optimization adds random numbers to symbol names
     NEED_DIS_DIFF_FILTER="
-        ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
+        ./lib/minimal/libjvm.so
         "
     DIS_DIFF_FILTER="$SED -r \
         -e 's/\.[0-9]+/.X/g' \
@@ -135,12 +135,12 @@
         -e 's/\t[0-9a-f]{5,} /\t<HEX> /' \
         "
     KNOWN_DIS_DIFF="
-        ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
+        ./lib/minimal/libjvm.so
         "
     MAX_KNOWN_DIS_DIFF_SIZE="3000"
 
     NEED_SYMBOLS_DIFF_FILTER="
-        ./lib$OPENJDK_TARGET_CPU_LIBDIR/minimal/libjvm.so
+        ./lib/minimal/libjvm.so
         "
     SYMBOLS_DIFF_FILTER="$SED -r \
         -e 's/\.[0-9]+/.X/g'
@@ -163,11 +163,11 @@
       "
 
   SORT_SYMBOLS="
-      ./lib/amd64/server/libjvm.so
-      ./lib/amd64/libfontmanager.so
-      ./lib/amd64/libjimage.so
-      ./lib/amd64/libsaproc.so
-      ./lib/amd64/libunpack.so
+      ./lib/server/libjvm.so
+      ./lib/libfontmanager.so
+      ./lib/libjimage.so
+      ./lib/libsaproc.so
+      ./lib/libunpack.so
       ./bin/unpack200
       "
 
@@ -183,48 +183,48 @@
       ./demo/jvmti/mtrace/lib/libmtrace.so
       ./demo/jvmti/versionCheck/lib/libversionCheck.so
       ./demo/jvmti/waiters/lib/libwaiters.so
-      ./lib/amd64/jli/libjli.so
-      ./lib/amd64/jspawnhelper
-      ./lib/amd64/libJdbcOdbc.so
-      ./lib/amd64/libattach.so
-      ./lib/amd64/libawt.so
-      ./lib/amd64/libawt_headless.so
-      ./lib/amd64/libawt_xawt.so
-      ./lib/amd64/libdcpr.so
-      ./lib/amd64/libdt_socket.so
-      ./lib/amd64/libfontmanager.so
-      ./lib/amd64/libinstrument.so
-      ./lib/amd64/libj2gss.so
-      ./lib/amd64/libj2pcsc.so
-      ./lib/amd64/libj2pkcs11.so
-      ./lib/amd64/libj2ucrypto.so
-      ./lib/amd64/libjaas_unix.so
-      ./lib/amd64/libjava.so
-      ./lib/amd64/libjawt.so
-      ./lib/amd64/libjdwp.so
-      ./lib/amd64/libjpeg.so
-      ./lib/amd64/libjsdt.so
-      ./lib/amd64/libjsound.so
-      ./lib/amd64/libkcms.so
-      ./lib/amd64/liblcms.so
-      ./lib/amd64/libmanagement.so
-      ./lib/amd64/libmlib_image.so
-      ./lib/amd64/libnet.so
-      ./lib/amd64/libnio.so
-      ./lib/amd64/libnpt.so
-      ./lib/amd64/libsctp.so
-      ./lib/amd64/libsplashscreen.so
-      ./lib/amd64/libsunec.so
-      ./lib/amd64/libsunwjdga.so
-      ./lib/amd64/libt2k.so
-      ./lib/amd64/libunpack.so
-      ./lib/amd64/libverify.so
-      ./lib/amd64/libzip.so
-      ./lib/amd64/server/64/libjvm_db.so
-      ./lib/amd64/server/64/libjvm_dtrace.so
-      ./lib/amd64/server/libjvm.so
-      ./lib/amd64/server/libjvm_db.so
-      ./lib/amd64/server/libjvm_dtrace.so
+      ./lib/jli/libjli.so
+      ./lib/jspawnhelper
+      ./lib/libJdbcOdbc.so
+      ./lib/libattach.so
+      ./lib/libawt.so
+      ./lib/libawt_headless.so
+      ./lib/libawt_xawt.so
+      ./lib/libdcpr.so
+      ./lib/libdt_socket.so
+      ./lib/libfontmanager.so
+      ./lib/libinstrument.so
+      ./lib/libj2gss.so
+      ./lib/libj2pcsc.so
+      ./lib/libj2pkcs11.so
+      ./lib/libj2ucrypto.so
+      ./lib/libjaas_unix.so
+      ./lib/libjava.so
+      ./lib/libjawt.so
+      ./lib/libjdwp.so
+      ./lib/libjpeg.so
+      ./lib/libjsdt.so
+      ./lib/libjsound.so
+      ./lib/libkcms.so
+      ./lib/liblcms.so
+      ./lib/libmanagement.so
+      ./lib/libmlib_image.so
+      ./lib/libnet.so
+      ./lib/libnio.so
+      ./lib/libnpt.so
+      ./lib/libsctp.so
+      ./lib/libsplashscreen.so
+      ./lib/libsunec.so
+      ./lib/libsunwjdga.so
+      ./lib/libt2k.so
+      ./lib/libunpack.so
+      ./lib/libverify.so
+      ./lib/libzip.so
+      ./lib/server/64/libjvm_db.so
+      ./lib/server/64/libjvm_dtrace.so
+      ./lib/server/libjvm.so
+      ./lib/server/libjvm_db.so
+      ./lib/server/libjvm_dtrace.so
       ./bin/appletviewer
       ./bin/idlj
       ./bin/jar
@@ -292,13 +292,13 @@
 
   SORT_SYMBOLS="
       ./demo/jvmti/waiters/lib/libwaiters.so
-      ./lib/sparcv9/libjsig.so
-      ./lib/sparcv9/libfontmanager.so
-      ./lib/sparcv9/libjimage.so
-      ./lib/sparcv9/libsaproc.so
-      ./lib/sparcv9/libunpack.so
-      ./lib/sparcv9/server/libjvm.so
-      ./lib/sparcv9/server/libjvm_dtrace.so
+      ./lib/libjsig.so
+      ./lib/libfontmanager.so
+      ./lib/libjimage.so
+      ./lib/libsaproc.so
+      ./lib/libunpack.so
+      ./lib/server/libjvm.so
+      ./lib/server/libjvm_dtrace.so
       ./bin/unpack200
       "
 
@@ -314,46 +314,46 @@
       ./demo/jvmti/mtrace/lib/libmtrace.so
       ./demo/jvmti/versionCheck/lib/libversionCheck.so
       ./demo/jvmti/waiters/lib/libwaiters.so
-      ./lib/sparcv9/client/libjvm.so
-      ./lib/sparcv9/jli/libjli.so
-      ./lib/sparcv9/jspawnhelper
-      ./lib/sparcv9/libJdbcOdbc.so
-      ./lib/sparcv9/libattach.so
-      ./lib/sparcv9/libawt.so
-      ./lib/sparcv9/libawt_headless.so
-      ./lib/sparcv9/libawt_xawt.so
-      ./lib/sparcv9/libdcpr.so
-      ./lib/sparcv9/libdt_socket.so
-      ./lib/sparcv9/libfontmanager.so
-      ./lib/sparcv9/libinstrument.so
-      ./lib/sparcv9/libj2gss.so
-      ./lib/sparcv9/libj2pcsc.so
-      ./lib/sparcv9/libj2pkcs11.so
-      ./lib/sparcv9/libj2ucrypto.so
-      ./lib/sparcv9/libjaas_unix.so
-      ./lib/sparcv9/libjava.so
-      ./lib/sparcv9/libjawt.so
-      ./lib/sparcv9/libjdwp.so
-      ./lib/sparcv9/libjpeg.so
-      ./lib/sparcv9/libjsdt.so
-      ./lib/sparcv9/libjsound.so
-      ./lib/sparcv9/libkcms.so
-      ./lib/sparcv9/liblcms.so
-      ./lib/sparcv9/libmanagement.so
-      ./lib/sparcv9/libmlib_image.so
-      ./lib/sparcv9/libmlib_image_v.so
-      ./lib/sparcv9/libnet.so
-      ./lib/sparcv9/libnio.so
-      ./lib/sparcv9/libnpt.so
-      ./lib/sparcv9/libsctp.so
-      ./lib/sparcv9/libsplashscreen.so
-      ./lib/sparcv9/libsunec.so
-      ./lib/sparcv9/libsunwjdga.so
-      ./lib/sparcv9/libt2k.so
-      ./lib/sparcv9/libunpack.so
-      ./lib/sparcv9/libverify.so
-      ./lib/sparcv9/libzip.so
-      ./lib/sparcv9/server/libjvm.so
+      ./lib/client/libjvm.so
+      ./lib/jli/libjli.so
+      ./lib/jspawnhelper
+      ./lib/libJdbcOdbc.so
+      ./lib/libattach.so
+      ./lib/libawt.so
+      ./lib/libawt_headless.so
+      ./lib/libawt_xawt.so
+      ./lib/libdcpr.so
+      ./lib/libdt_socket.so
+      ./lib/libfontmanager.so
+      ./lib/libinstrument.so
+      ./lib/libj2gss.so
+      ./lib/libj2pcsc.so
+      ./lib/libj2pkcs11.so
+      ./lib/libj2ucrypto.so
+      ./lib/libjaas_unix.so
+      ./lib/libjava.so
+      ./lib/libjawt.so
+      ./lib/libjdwp.so
+      ./lib/libjpeg.so
+      ./lib/libjsdt.so
+      ./lib/libjsound.so
+      ./lib/libkcms.so
+      ./lib/liblcms.so
+      ./lib/libmanagement.so
+      ./lib/libmlib_image.so
+      ./lib/libmlib_image_v.so
+      ./lib/libnet.so
+      ./lib/libnio.so
+      ./lib/libnpt.so
+      ./lib/libsctp.so
+      ./lib/libsplashscreen.so
+      ./lib/libsunec.so
+      ./lib/libsunwjdga.so
+      ./lib/libt2k.so
+      ./lib/libunpack.so
+      ./lib/libverify.so
+      ./lib/libzip.so
+      ./lib/server/libjvm.so
       ./bin/appletviewer
       ./bin/idlj
       ./bin/jar
@@ -409,7 +409,7 @@
       "
 
   KNOWN_DIS_DIFF="
-      ./lib/sparcv9/libsaproc.so
+      ./lib/libsaproc.so
   "
 
   MAX_KNOWN_DIS_DIFF_SIZE="3000"
@@ -417,8 +417,8 @@
   # On slowdebug the disassembly can differ randomly.
   if [ "$DEBUG_LEVEL" = "slowdebug" ]; then
     ACCEPTED_DIS_DIFF="
-        ./lib/sparcv9/libfontmanager.so
-        ./lib/sparcv9/server/libjvm.so
+        ./lib/libfontmanager.so
+        ./lib/server/libjvm.so
     "
   fi
 
--- a/make/common/MakeBase.gmk	Thu Dec 08 16:18:03 2016 +0100
+++ b/make/common/MakeBase.gmk	Thu Dec 08 17:13:07 2016 +0100
@@ -861,13 +861,8 @@
 ################################################################################
 # Find lib dir for module
 # Param 1 - module name
-ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
-  FindLibDirForModule = \
-      $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR)
-else
-  FindLibDirForModule = \
-      $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
-endif
+FindLibDirForModule = \
+    $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
 
 ################################################################################
 # Return a string suitable for use after a -classpath or --module-path option. It