Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Apr 2014 05:02:35 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r352085 - in head/java/openjdk8: . files
Message-ID:  <201404250502.s3P52Z7E036235@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Fri Apr 25 05:02:35 2014
New Revision: 352085
URL: http://svnweb.freebsd.org/changeset/ports/352085
QAT: https://qat.redports.org/buildarchive/r352085/

Log:
  - Disable ccache.  Precompiled headers seem to cause troubles with it. [1]
  - Add more BSD patches for Java files and fix endianness issues for C files.
  
  Reported by:	Jenkins (via swills) [1]

Modified:
  head/java/openjdk8/Makefile
  head/java/openjdk8/files/patch-bsd

Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile	Fri Apr 25 04:56:01 2014	(r352084)
+++ head/java/openjdk8/Makefile	Fri Apr 25 05:02:35 2014	(r352085)
@@ -2,6 +2,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/:jdk \
 		https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
@@ -35,7 +36,8 @@ BUILD_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}
 ONLY_FOR_ARCHS=	i386 amd64
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-DOS2UNIX_FILES=	jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
+DOS2UNIX_FILES=	jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties \
+		nashorn/test/script/jfx.js
 SHEBANG_FILES=	configure
 
 _MAKE_JOBS=	#
@@ -50,6 +52,7 @@ JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/j2s
 JDK_OSARCH=	bsd-${ARCH:S/i386/x86/:S/amd64/x86_64/}
 INSTALLDIR=	${PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}
 
+NO_CCACHE=		yes
 NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	8
@@ -64,7 +67,8 @@ CONFIGURE_ARGS+=	--with-build-number="b$
 .if ${JDK_UPDATE_VERSION} > 0
 CONFIGURE_ARGS+=	--with-update-version=${JDK_UPDATE_VERSION}
 .endif
-CONFIGURE_ARGS+=	--disable-freetype-bundling \
+CONFIGURE_ARGS+=	--disable-ccache \
+			--disable-freetype-bundling \
 			--disable-zip-debug-info \
 			--with-alsa=${LOCALBASE} \
 			--with-cacerts-file=${FILESDIR}/cacerts \

Modified: head/java/openjdk8/files/patch-bsd
==============================================================================
--- head/java/openjdk8/files/patch-bsd	Fri Apr 25 04:56:01 2014	(r352084)
+++ head/java/openjdk8/files/patch-bsd	Fri Apr 25 05:02:35 2014	(r352085)
@@ -118,6 +118,27 @@
    else
      if test "x$OPENJDK_TARGET_OS" = xsolaris; then
        # If it is not gcc, then assume it is the Oracle Solaris Studio Compiler
+@@ -887,18 +889,9 @@
+   AC_SUBST(PACKAGE_PATH)
+ 
+   if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
+-    # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
+-    #   Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
+-    #   (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
+-    #   Note: -Dmacro         is the same as    #define macro 1
+-    #         -Dmacro=        is the same as    #define macro
+-    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
+-      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
+-    else
+-      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
+-    fi
++    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_LITTLE_ENDIAN"
+   else
+-    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
++    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DVM_BIG_ENDIAN"
+   fi
+   if test "x$OPENJDK_TARGET_OS" = xlinux; then
+     CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX"
 --- hotspot/make/bsd/makefiles/build_vm_def.sh
 +++ hotspot/make/bsd/makefiles/build_vm_def.sh
 @@ -1,12 +1,21 @@
@@ -5407,40 +5428,6 @@
 +    <includes>${includes}</includes>
 +    <excludes>${excludes}</excludes>
 +</source-folder>
---- jdk/make/netbeans/j2se/nbproject/project.xml
-+++ jdk/make/netbeans/j2se/nbproject/project.xml
-@@ -34,6 +34,7 @@
- <!DOCTYPE project [
-     <!ENTITY properties SYSTEM "../../common/properties.ent">
-     <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
-+    <!ENTITY bsd-sources SYSTEM "../../common/bsd-sources.ent">
-     <!ENTITY macosx-sources SYSTEM "../../common/macosx-sources.ent">
-     <!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
-     <!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
-@@ -41,6 +42,7 @@
-     <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
-     <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
-     <!ENTITY share-view SYSTEM "../../common/share-view.ent">
-+    <!ENTITY bsd-view SYSTEM "../../common/bsd-view.ent">
-     <!ENTITY macosx-view SYSTEM "../../common/macosx-view.ent">
-     <!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
-     <!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
-@@ -60,6 +62,7 @@
-             </properties>
-             <folders>
-                 &share-sources;
-+                &bsd-sources;
-                 &macosx-sources;
-                 &unix-sources;
-                 &windows-sources;
-@@ -86,6 +89,7 @@
-             <view>
-                 <items>
-                     &share-view;
-+                    &bsd-view;
-                     &macosx-view;
-                     &unix-view;
-                     &windows-view;
 --- jdk/make/netbeans/common/java-data-native.ent
 +++ jdk/make/netbeans/common/java-data-native.ent
 @@ -34,6 +34,7 @@
@@ -5487,6 +5474,40 @@
      <macrodef name="make-run">
              <attribute name="target"/>
              <attribute name="dir"/>
+--- jdk/make/netbeans/j2se/nbproject/project.xml
++++ jdk/make/netbeans/j2se/nbproject/project.xml
+@@ -34,6 +34,7 @@
+ <!DOCTYPE project [
+     <!ENTITY properties SYSTEM "../../common/properties.ent">
+     <!ENTITY share-sources SYSTEM "../../common/share-sources.ent">
++    <!ENTITY bsd-sources SYSTEM "../../common/bsd-sources.ent">
+     <!ENTITY macosx-sources SYSTEM "../../common/macosx-sources.ent">
+     <!ENTITY unix-sources SYSTEM "../../common/unix-sources.ent">
+     <!ENTITY windows-sources SYSTEM "../../common/windows-sources.ent">
+@@ -41,6 +42,7 @@
+     <!ENTITY build-folder SYSTEM "../../common/build-folder.ent">
+     <!ENTITY standard-bindings SYSTEM "../../common/standard-bindings.ent">
+     <!ENTITY share-view SYSTEM "../../common/share-view.ent">
++    <!ENTITY bsd-view SYSTEM "../../common/bsd-view.ent">
+     <!ENTITY macosx-view SYSTEM "../../common/macosx-view.ent">
+     <!ENTITY unix-view SYSTEM "../../common/unix-view.ent">
+     <!ENTITY windows-view SYSTEM "../../common/windows-view.ent">
+@@ -60,6 +62,7 @@
+             </properties>
+             <folders>
+                 &share-sources;
++                &bsd-sources;
+                 &macosx-sources;
+                 &unix-sources;
+                 &windows-sources;
+@@ -86,6 +89,7 @@
+             <view>
+                 <items>
+                     &share-view;
++                    &bsd-view;
+                     &macosx-view;
+                     &unix-view;
+                     &windows-view;
 --- jdk/make/netbeans/world/nbproject/project.xml
 +++ jdk/make/netbeans/world/nbproject/project.xml
 @@ -34,12 +34,14 @@
@@ -5531,6 +5552,69 @@
  #define JLI_Lseek                       lseek
  #endif
  #endif /* _WIN32 */
+--- jdk/src/share/classes/sun/awt/FontConfiguration.java
++++ jdk/src/share/classes/sun/awt/FontConfiguration.java
+@@ -1146,7 +1146,7 @@
+      */
+     HashMap<String, Boolean> existsMap;
+     public boolean needToSearchForFile(String fileName) {
+-        if (!FontUtilities.isLinux) {
++        if (!FontUtilities.isLinux && !FontUtilities.isBSD) {
+             return false;
+         } else if (existsMap == null) {
+            existsMap = new HashMap<String, Boolean>();
+--- jdk/src/share/classes/sun/awt/OSInfo.java
++++ jdk/src/share/classes/sun/awt/OSInfo.java
+@@ -39,6 +39,7 @@
+         WINDOWS,
+         LINUX,
+         SOLARIS,
++        BSD,
+         MACOSX,
+         UNKNOWN
+     }
+@@ -101,6 +102,10 @@
+                 return SOLARIS;
+             }
+ 
++            if (osName.endsWith("BSD")) {
++                return BSD;
++            }
++
+             if (osName.contains("OS X")) {
+                 return MACOSX;
+             }
+--- jdk/src/share/classes/sun/font/FontUtilities.java
++++ jdk/src/share/classes/sun/font/FontUtilities.java
+@@ -48,6 +48,8 @@
+ 
+     public static boolean isLinux;
+ 
++    public static boolean isBSD;
++
+     public static boolean isMacOSX;
+ 
+     public static boolean isSolaris8;
+@@ -78,6 +80,8 @@
+ 
+                 isLinux = osName.startsWith("Linux");
+ 
++                isBSD = osName.endsWith("BSD");
++
+                 isMacOSX = osName.contains("OS X"); // TODO: MacOSX
+ 
+                 String t2kStr = System.getProperty("sun.java2d.font.scaler");
+--- jdk/src/share/classes/sun/font/SunFontManager.java
++++ jdk/src/share/classes/sun/font/SunFontManager.java
+@@ -418,7 +418,7 @@
+                          * registerFonts method as on-screen these JRE fonts
+                          * always go through the T2K rasteriser.
+                          */
+-                        if (FontUtilities.isLinux) {
++                        if (FontUtilities.isLinux || FontUtilities.isBSD) {
+                             /* Linux font configuration uses these fonts */
+                             registerFontDir(jreFontDirName);
+                         }
 --- jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
 +++ jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
 @@ -1298,7 +1298,7 @@
@@ -5542,6 +5626,54 @@
              charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
                      new String[] {
                          "COMPOUND_TEXT",        // JDK historical
+--- jdk/src/share/classes/sun/print/PSPrinterJob.java
++++ jdk/src/share/classes/sun/print/PSPrinterJob.java
+@@ -1587,7 +1587,7 @@
+         }
+ 
+        String osname = System.getProperty("os.name");
+-       if (osname.equals("Linux") || osname.contains("OS X")) {
++       if (osname.equals("Linux") || osname.endsWith("BSD") || osname.contains("OS X")) {
+             execCmd = new String[ncomps];
+             execCmd[n++] = "/usr/bin/lpr";
+             if ((pFlags & PRINTER) != 0) {
+--- jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java
++++ jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java
+@@ -48,6 +48,7 @@
+                     public Boolean run() {
+                             String osname = System.getProperty("os.name");
+                             if (osname.startsWith("SunOS") ||
++                                osname.endsWith("BSD") ||
+                                 osname.contains("OS X") ||
+                                 osname.startsWith("Linux")) {
+                                 return new Boolean(System.getProperty
+--- jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
++++ jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
+@@ -90,6 +90,12 @@
+                                     "libgssapi_krb5.so",
+                                     "libgssapi_krb5.so.2",
+                                 };
++                            } else if (osname.endsWith("BSD")) {
++                                gssLibs = new String[]{
++                                    "libgssapi.so",
++                                    "libgssapi_krb5.so",
++                                    "libgssapi_krb5.so.10",
++                                };
+                             } else if (osname.contains("OS X")) {
+                                 gssLibs = new String[]{
+                                     "libgssapi_krb5.dylib",
+--- jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
++++ jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
+@@ -403,7 +403,8 @@
+             long uid = 0;
+ 
+             if (osname.startsWith("SunOS") ||
+-                (osname.startsWith("Linux"))) {
++                osname.startsWith("Linux") ||
++                osname.endsWith("BSD")) {
+                 try {
+                     Class<?> c = Class.forName
+                         ("com.sun.security.auth.module.UnixSystem");
 --- jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider
 +++ jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider
 @@ -31,3 +31,4 @@
@@ -6050,6 +6182,2408 @@
 +#
 +# Example:
 +#   jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048
+--- jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
++++ jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
+@@ -62,7 +62,7 @@
+ 
+ #endif // End of ZLIB
+ 
+-#ifdef _BIG_ENDIAN
++#ifdef VM_BIG_ENDIAN
+ #define SWAP_BYTES(a) \
+     ((((a) << 8) & 0xff00) | 0x00ff) & (((a) >> 8) | 0xff00)
+ #else
+--- jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c
++++ jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c
+@@ -120,7 +120,7 @@
+ }
+ 
+ /* conversion from/to 16 bit signed little endian to native endian samples */
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ #define MAP_LE_SHORT2SAMPLE(sh) ((MAP_Sample) (sh))
+ #define MAP_SAMPLE2LE_SHORT(sample) (sample)
+ #define MAP_SAMPLE2LE_SHORT_CLIP(sample) MAP_ClipAndConvertToShort(sample)
+@@ -131,7 +131,7 @@
+ #endif
+ 
+ /* conversion from/to 16 bit signed big endian to native endian samples */
+-#ifndef _LITTLE_ENDIAN
++#ifndef VM_LITTLE_ENDIAN
+ #define MAP_BE_SHORT2SAMPLE(sh) ((MAP_Sample) (sh))
+ #define MAP_SAMPLE2BE_SHORT(sample) (sample)
+ #define MAP_SAMPLE2BE_SHORT_CLIP(sample) MAP_ClipAndConvertToShort(sample)
+@@ -150,7 +150,7 @@
+ #define MAP_SAMPLE2INT8_CLIP(sample) MAP_ClipAndConvertToByte(sample)
+ 
+ /* macros for endian conversion */
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ #define MAP_NATIVE2LE16(a) (a)
+ #define MAP_NATIVE2BE16(a) MAP_SWAP16_impl(a)
+ #define MAP_NATIVE2LE32(a) (a)
+--- jdk/src/share/native/com/sun/media/sound/Utilities.c
++++ jdk/src/share/native/com/sun/media/sound/Utilities.c
+@@ -28,7 +28,7 @@
+ 
+ 
+ int UTIL_IsBigEndianPlatform() {
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+     return 0;
+ #else
+     return 1;
+--- jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
++++ jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
+@@ -40,7 +40,7 @@
+ #endif
+ #endif
+ 
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ #define __HI(x) *(1+(int*)&x)
+ #define __LO(x) *(int*)&x
+ #define __HIp(x) *(1+(int*)x)
+--- jdk/src/share/native/sun/awt/image/awt_parseImage.c
++++ jdk/src/share/native/sun/awt/image/awt_parseImage.c
+@@ -599,7 +599,7 @@
+     switch(type) {
+         case java_awt_image_BufferedImage_TYPE_INT_ARGB:
+         case java_awt_image_BufferedImage_TYPE_INT_ARGB_PRE:
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+             colorOrder[0] = 2;
+             colorOrder[1] = 1;
+             colorOrder[2] = 0;
+@@ -612,7 +612,7 @@
+ #endif
+             break;
+         case java_awt_image_BufferedImage_TYPE_INT_BGR:
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+             colorOrder[0] = 0;
+             colorOrder[1] = 1;
+             colorOrder[2] = 2;
+@@ -623,7 +623,7 @@
+ #endif
+             break;
+         case java_awt_image_BufferedImage_TYPE_INT_RGB:
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+             colorOrder[0] = 2;
+             colorOrder[1] = 1;
+             colorOrder[2] = 0;
+--- jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
++++ jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
+@@ -1175,7 +1175,7 @@
+ 
+ #define NLUT 8
+ 
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ #define INDEXES    { 3, 2, 1, 0, 7, 6, 5, 4 }
+ #else
+ #define INDEXES    { 0, 1, 2, 3, 4, 5, 6, 7 }
+--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c
+@@ -86,7 +86,7 @@
+ #endif /* MLIB_USE_FTOI_CLAMPING */
+ 
+ /***************************************************************/
+-#if defined(_LITTLE_ENDIAN) && !defined(_NO_LONGLONG)
++#if defined(VM_LITTLE_ENDIAN) && !defined(_NO_LONGLONG)
+ 
+ /* NB: Explicit cast to DTYPE is necessary to avoid warning from Microsoft VC compiler.
+       And we need to explicitly define cast behavior if source exceeds destination range.
+@@ -103,7 +103,7 @@
+   dp[0    ] = (DTYPE) ((res0) & DTYPE_MASK);                      \
+   dp[chan1] = (DTYPE) ((res1) & DTYPE_MASK)
+ 
+-#endif /* defined(_LITTLE_ENDIAN) && !defined(_NO_LONGLONG) */
++#endif /* defined(VM_LITTLE_ENDIAN) && !defined(_NO_LONGLONG) */
+ 
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -114,17 +114,17 @@
+ 
+ #else /* _NO_LONGLONG */
+ 
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | ((mlib_s64)sp[0] & 0xffffffff)
+ 
+-#else /* _LITTLE_ENDIAN */
++#else /* VM_LITTLE_ENDIAN */
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | ((mlib_s64)sp[chan1] & 0xffffffff)
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ 
+ #endif /* _NO_LONGLONG */
+ 
+--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
+@@ -126,7 +126,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+ 
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define STORE2(res0, res1)                                      \
+   dp[0    ] = res1;                                             \
+@@ -138,7 +138,7 @@
+   dp[0    ] = res0;                                             \
+   dp[chan1] = res1
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ 
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -149,17 +149,17 @@
+ 
+ #else /* _NO_LONGLONG */
+ 
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+ 
+-#else /* _LITTLE_ENDIAN */
++#else /* VM_LITTLE_ENDIAN */
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+ 
+ /***************************************************************/
+--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
+@@ -94,7 +94,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+ 
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define STORE2(res0, res1)                                      \
+   dp[0    ] = res1;                                             \
+@@ -106,7 +106,7 @@
+   dp[0    ] = res0;                                             \
+   dp[chan1] = res1
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ 
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -117,17 +117,17 @@
+ 
+ #else /* _NO_LONGLONG */
+ 
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+ 
+-#else /* _LITTLE_ENDIAN */
++#else /* VM_LITTLE_ENDIAN */
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+ 
+ /***************************************************************/
+--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
+@@ -126,7 +126,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+ 
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define STORE2(res0, res1)                                      \
+   dp[0    ] = res1;                                             \
+@@ -138,7 +138,7 @@
+   dp[0    ] = res0;                                             \
+   dp[chan1] = res1
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ 
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -149,17 +149,17 @@
+ 
+ #else /* _NO_LONGLONG */
+ 
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+ 
+-#else /* _LITTLE_ENDIAN */
++#else /* VM_LITTLE_ENDIAN */
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+ 
+ /***************************************************************/
+--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
+@@ -95,7 +95,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+ 
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define STORE2(res0, res1)                                      \
+   dp[0    ] = res1;                                             \
+@@ -107,7 +107,7 @@
+   dp[0    ] = res0;                                             \
+   dp[chan1] = res1
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ 
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -118,17 +118,17 @@
+ 
+ #else /* _NO_LONGLONG */
+ 
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+ 
+-#else /* _LITTLE_ENDIAN */
++#else /* VM_LITTLE_ENDIAN */
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+ 
+ /***************************************************************/
+--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
+@@ -126,7 +126,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+ 
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define STORE2(res0, res1)                                      \
+   dp[0    ] = res1;                                             \
+@@ -138,7 +138,7 @@
+   dp[0    ] = res0;                                             \
+   dp[chan1] = res1
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ 
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -149,17 +149,17 @@
+ 
+ #else /* _NO_LONGLONG */
+ 
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+ 
+-#else /* _LITTLE_ENDIAN */
++#else /* VM_LITTLE_ENDIAN */
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+ 
+ /***************************************************************/
+--- jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
+@@ -94,7 +94,7 @@
+ #define D2I(x) CLAMP_S32((x) SAT_OFF)
+ 
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define STORE2(res0, res1)                                      \
+   dp[0    ] = res1;                                             \
+@@ -106,7 +106,7 @@
+   dp[0    ] = res0;                                             \
+   dp[chan1] = res1
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ 
+ /***************************************************************/
+ #ifdef _NO_LONGLONG
+@@ -117,17 +117,17 @@
+ 
+ #else /* _NO_LONGLONG */
+ 
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[chan1]) << 32) | S64TOS32((mlib_s64)sp[0])
+ 
+-#else /* _LITTLE_ENDIAN */
++#else /* VM_LITTLE_ENDIAN */
+ 
+ #define LOAD_BUFF(buff)                                         \
+   *(mlib_s64*)(buff + i) = (((mlib_s64)sp[0]) << 32) | S64TOS32((mlib_s64)sp[chan1])
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ #endif /* _NO_LONGLONG */
+ 
+ /***************************************************************/
+--- jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
+@@ -95,7 +95,7 @@
+     dst = dp[0];
+     if (ld_offset + size < 32) {
+       dmask = (mask0 << (32 - size)) >> ld_offset;
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+       src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+       src = (src0 >> (ld_offset - ls_offset));
+       dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -104,12 +104,12 @@
+ #else
+       src = (src0 >> (ld_offset - ls_offset));
+       dp[0] = (dst & (~dmask)) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+       return;
+     }
+ 
+     dmask = mask0 >> ld_offset;
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+     src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+     src = (src0 >> (ld_offset - ls_offset));
+     dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -118,7 +118,7 @@
+ #else
+     src = (src0 >> (ld_offset - ls_offset));
+     dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+     j = 32 - ld_offset;
+     dp++;
+     ls_offset += j;
+@@ -131,7 +131,7 @@
+ 
+     if (ld_offset + size < 32) {
+       dmask = (mask0 << (32 - size)) >> ld_offset;
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+       src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+       src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+       src = (src0 << shift) | (src1 >> (32 - shift));
+@@ -141,12 +141,12 @@
+ #else
+       src = (src0 << shift) | (src1 >> (32 - shift));
+       dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+       return;
+     }
+ 
+     dmask = mask0 >> ld_offset;
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+     src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+     src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+     src = (src0 << shift) | (src1 >> (32 - shift));
+@@ -156,7 +156,7 @@
+ #else
+     src = (src0 << shift) | (src1 >> (32 - shift));
+     dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+     j = 32 - ld_offset;
+     dp++;
+     sp++;
+@@ -164,19 +164,19 @@
+   }
+ 
+   if (j < size) src1 = sp[0];
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+   src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+   for (; j <= size - 32; j += 32) {
+     src0 = src1;
+     src1 = sp[1];
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+     src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+     src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
+     dp[0] = (src << 24) | ((src & 0xFF00) << 8) | ((src >> 8) & 0xFF00) | (src >> 24);
+ #else
+     dp[0] = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+     sp++;
+     dp++;
+   }
+@@ -187,7 +187,7 @@
+     if (ls_offset + j > 32) src1 = sp[1];
+     dst = dp[0];
+     dmask = mask0 << (32 - j);
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+     src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+     src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
+     dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -196,7 +196,7 @@
+ #else
+     src = (src0 << ls_offset) | (src1 >> (32 - ls_offset));
+     dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+   }
+ 
+ #else /* _LONGLONG */
+@@ -315,7 +315,7 @@
+     dst = dp[0];
+     if (ld_offset >= size) {
+       dmask = (lmask0 << (32 - size)) >> (ld_offset - size);
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+       src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+       src = (src0 << (ls_offset - ld_offset));
+       dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -324,12 +324,12 @@
+ #else
+       src = (src0 << (ls_offset - ld_offset));
+       dp[0] = (dst & (~dmask)) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+       return;
+     }
+ 
+     dmask = lmask0 << (32 - ld_offset);
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+     src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+     src = (src0 << (ls_offset - ld_offset));
+     dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -338,7 +338,7 @@
+ #else
+     src = (src0 << (ls_offset - ld_offset));
+     dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+     j = ld_offset;
+     dp--;
+     ls_offset -= j;
+@@ -351,7 +351,7 @@
+ 
+     if (ld_offset >= size) {
+       dmask = (lmask0 << (32 - size)) >> (ld_offset - size);
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+       src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+       src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+       src = (src0 >> shift) | (src1 << (32 - shift));
+@@ -361,12 +361,12 @@
+ #else
+       src = (src0 >> shift) | (src1 << (32 - shift));
+       dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+       return;
+     }
+ 
+     dmask = lmask0 << (32 - ld_offset);
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+     src0 = (src0 << 24) | ((src0 & 0xFF00) << 8) | ((src0 >> 8) & 0xFF00) | (src0 >> 24);
+     src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+     src = (src0 >> shift) | (src1 << (32 - shift));
+@@ -376,7 +376,7 @@
+ #else
+     src = (src0 >> shift) | (src1 << (32 - shift));
+     dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+     j = ld_offset;
+     dp--;
+     sp--;
+@@ -384,22 +384,22 @@
+   }
+ 
+   if (j < size) src1 = sp[0];
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+   src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ #ifdef __SUNPRO_C
+ #pragma pipeloop(0)
+ #endif /* __SUNPRO_C */
+   for (; j <= size - 32; j += 32) {
+     src0 = src1;
+     src1 = sp[-1];
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+     src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+     src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
+     dp[0] = (src << 24) | ((src & 0xFF00) << 8) | ((src >> 8) & 0xFF00) | (src >> 24);
+ #else
+     dp[0] = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+     sp--;
+     dp--;
+   }
+@@ -410,7 +410,7 @@
+     if (ls_offset < j) src1 = sp[-1];
+     dst = dp[0];
+     dmask = lmask0 >> (32 - j);
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+     src1 = (src1 << 24) | ((src1 & 0xFF00) << 8) | ((src1 >> 8) & 0xFF00) | (src1 >> 24);
+     src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
+     dst = (dst << 24) | ((dst & 0xFF00) << 8) | ((dst >> 8) & 0xFF00) | (dst >> 24);
+@@ -419,7 +419,7 @@
+ #else
+     src = (src0 >> (32 - ls_offset)) | (src1 << ls_offset);
+     dp[0] = (dst & ~dmask) | (src & dmask);
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+   }
+ 
+ #else  /* _LONGLONG */
+--- jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c
++++ jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c
+@@ -168,7 +168,7 @@
+ }
+ 
+ /***************************************************************/
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+ 
+ #define READ_U8_D64(table0, table1, table2, table3)             \
+   t0 = *(mlib_d64*)((mlib_u8*)table0 + ((s0 << 3) & 0x7F8));    \
+@@ -184,7 +184,7 @@
+   t2 = *(mlib_d64*)((mlib_u8*)table2 + ((s0 >> 5)  & 0x7F8));   \
+   t3 = *(mlib_d64*)((mlib_u8*)table3 + ((s0 << 3)  & 0x7F8))
+ 
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+ 
+ /***************************************************************/
+ void mlib_ImageLookUp_U8_D64(const mlib_u8  *src,
+@@ -613,7 +613,7 @@
+ #pragma pipeloop(0)
+ #endif /* __SUNPRO_C */
+       for (i = 0; i < size - 7; i += 4, dp += 8, sa++) {
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+         t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+         t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+         t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
+@@ -623,12 +623,12 @@
+         t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
+         t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+         t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+         dp[0] = t0;
+         dp[1] = t1;
+         dp[2] = t2;
+         dp[3] = t3;
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+         t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+         t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+         t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
+@@ -638,7 +638,7 @@
+         t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
+         t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+         t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+         s0 = sa[0];
+         dp[4] = t0;
+         dp[5] = t1;
+@@ -646,7 +646,7 @@
+         dp[7] = t3;
+       }
+ 
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+       t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+       t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+       t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 5) & 0x7F8));
+@@ -656,12 +656,12 @@
+       t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 21) & 0x7F8));
+       t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+       t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+       dp[0] = t0;
+       dp[1] = t1;
+       dp[2] = t2;
+       dp[3] = t3;
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+       t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+       t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+       t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 21) & 0x7F8));
+@@ -671,7 +671,7 @@
+       t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 5) & 0x7F8));
+       t2 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+       t3 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+       dp[4] = t0;
+       dp[5] = t1;
+       dp[6] = t2;
+@@ -719,7 +719,7 @@
+ #pragma pipeloop(0)
+ #endif /* __SUNPRO_C */
+       for (i = 0; i < size - 7; i += 4, dp += 12, sa++) {
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+         t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 << 3) & 0x7F8));
+         t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 << 3) & 0x7F8));
+         t2 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 << 3) & 0x7F8));
+@@ -733,14 +733,14 @@
+         t3 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+         t4 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));
+         t5 = *(mlib_d64 *) ((mlib_u8 *) tab2 + ((s0 >> 13) & 0x7F8));
+-#endif /* _LITTLE_ENDIAN */
++#endif /* VM_LITTLE_ENDIAN */
+         dp[0] = t0;
+         dp[1] = t1;
+         dp[2] = t2;
+         dp[3] = t3;
+         dp[4] = t4;
+         dp[5] = t5;
+-#ifdef _LITTLE_ENDIAN
++#ifdef VM_LITTLE_ENDIAN
+         t0 = *(mlib_d64 *) ((mlib_u8 *) tab0 + ((s0 >> 13) & 0x7F8));
+         t1 = *(mlib_d64 *) ((mlib_u8 *) tab1 + ((s0 >> 13) & 0x7F8));

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404250502.s3P52Z7E036235>