illumos: Apply pkgsrc patches.

Many of these have now been merged into the main Tribblix patch, those
that remain here should be investigated to see why they aren't required
on other distributions.

make/autoconf/flags-cflags.m4

@@ -506,7 +506,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     CFLAGS_OS_DEF_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
   elif test "x$OPENJDK_TARGET_OS" = xsolaris; then
     CFLAGS_OS_DEF_JVM="-DSOLARIS"
-    CFLAGS_OS_DEF_JDK="-D__solaris__"
+    CFLAGS_OS_DEF_JDK="-D__solaris__ -D__EXTENSIONS__"
   elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
     CFLAGS_OS_DEF_JVM="-D_ALLBSD_SOURCE -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"

make/autoconf/flags-other.m4

@@ -133,7 +133,10 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
 AC_DEFUN([FLAGS_SETUP_ASFLAGS_CPU_DEP],
 [
   # Misuse EXTRA_CFLAGS to mimic old behavior
+  # Skip on Solaris, otherwise -m64 leaks into GNU as, which is invalid.
+ if test "x$OPENJDK_TARGET_OS" != xsolaris; then
   $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS ${$2EXTRA_CFLAGS}"
+ fi
 
   if test "x$1" = "xTARGET" && \
       test "x$TOOLCHAIN_TYPE" = xgcc && \

test/micro/org/openjdk/bench/java/nio/genBuffers.sh

@@ -33,7 +33,7 @@ genBin() {
         for RO in "RO" ""
         do
         extraArgs=""
-        if [ "$RO" == "RO" ] ; then
+        if [ "$RO" = "RO" ] ; then
           extraArgs="-KRO"
         fi
         java build.tools.spp.Spp -be -nel -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 \
@@ -60,7 +60,7 @@ gen() {
     java build.tools.spp.Spp -be -nel -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 \
           -DMs=Heap -Dms=heap -DSWAP="" -DRO="" -iX-Buffers-bin.java.template -o$out
 
-    if [ "$1" == "byte" ] ; then
+    if [ "$1" = "byte" ] ; then
       genBin $1 $2 $3 $4 X-ByteBuffers-bin.java.template
       genBin char Char Character 2 X-ByteBuffers-bin.java.template
       genBin short Short Short 2 X-ByteBuffers-bin.java.template