icedtea7-native: simple copy over from openjdk-7 branch

1 files changed, 204 insertions, 0 deletions

diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-sane-x86-arch.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-sane-x86-arch.patch
new file mode 100644
index 0000000..0ff00b7
--- /dev/null
+++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-sane-x86-arch.patch
@@ -0,0 +1,204 @@
+From 634840cbdefe385590ed170f0ed0f48d4b412550 Mon Sep 17 00:00:00 2001
+From: Henning Heinold <heinold@inf.fu-berlin.de>
+Date: Wed, 14 Mar 2012 22:34:51 +0100
+Subject: [PATCH] real patch
+
+---
+ jdk/make/common/shared/Compiler-gcc.gmk            |    4 +-
+ jdk/make/common/shared/Platform.gmk                |   18 ++++------
+ jdk/make/javax/sound/SoundDefs.gmk                 |    6 ++--
+ .../share/native/com/sun/media/sound/SoundDefs.h   |    2 +-
+ jdk/src/solaris/bin/i586/jvm.cfg                   |   38 --------------------
+ jdk/src/solaris/bin/x86/jvm.cfg                    |   38 ++++++++++++++++++++
+ 6 files changed, 51 insertions(+), 55 deletions(-)
+ delete mode 100644 jdk/src/solaris/bin/i586/jvm.cfg
+ create mode 100644 jdk/src/solaris/bin/x86/jvm.cfg
+
+diff --git openjdk/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+index e99068b..a05ca09 100644
+--- openjdk/jdk/make/common/shared/Compiler-gcc.gmk
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+@@ -91,8 +91,8 @@ ifeq ($(PLATFORM), linux)
+     REQUIRED_CC_VER = 3.2
+     REQUIRED_GCC_VER = 3.2.*
+   endif
+-  ifeq ($(ARCH), i586)
+-    # i586
++  ifeq ($(ARCH), x86)
++    # x86
+     REQUIRED_CC_VER = 3.2
+     REQUIRED_GCC_VER = 3.2.1*
+     REQUIRED_GCC_VER_INT = 3.2.1-7a
+diff --git openjdk/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
+index 5b21888..e508be0 100644
+--- openjdk/jdk/make/common/shared/Platform.gmk
++++ openjdk/jdk/make/common/shared/Platform.gmk
+@@ -53,11 +53,11 @@ PLATFORM_SHARED=done
+ #     VARIANT                     OPT or DBG, OPT is the default
+ #     TEMP_DISK                   /tmp or C:/temp
+ #     ARCH_DATA_MODEL             32 or 64
+-#     ARCH                        sparc, sparcv9, i586, amd64, or ia64
+-#     ARCH_FAMILY                 sparc or i586
++#     ARCH                        sparc, sparcv9, x86, amd64, or ia64
++#     ARCH_FAMILY                 sparc or x86
+ #     ARCHPROP                    sparc or x86
+ #     ARCH_VM_SUBDIR              jre/bin, jre/lib/sparc, etc.
+-#     LIBARCH                     sparc, sparcv9, i386, amd64, or ia64
++#     LIBARCH                     sparc, sparcv9, x86, amd64, or ia64
+ #     DEV_NULL                    destination of /dev/null, NUL or /dev/NULL
+ #     CLASSPATH_SEPARATOR         separator in classpath, ; or :
+ #     LIB_PREFIX                  dynamic or static library prefix, lib or empty
+@@ -67,7 +67,7 @@ PLATFORM_SHARED=done
+ #     EXE_SUFFIX                  executable file suffix, .exe or empty
+ #     BUNDLE_FILE_SUFFIX          suffix for bundles: .tar or .tar.gz
+ #     ISA_DIR                     solaris only: /sparcv9 or /amd64
+-#     LIBARCH32                   solaris only: sparc or i386
++#     LIBARCH32                   solaris only: sparc or x86
+ #     LIBARCH64                   solaris only: sparcv9 or amd64
+ #     USING_CYGWIN                windows only: true or false
+ #     ISHIELD_TEMP_MIN            windows only: minimum disk space in temp area
+@@ -165,7 +165,7 @@ ifeq ($(SYSTEM_UNAME), Linux)
+   endif
+   archExpr = case "$(mach)" in \
+                 i[3-9]86) \
+-                    echo i586 \
++                    echo x86 \
+                     ;; \
+                 ia64) \
+                     echo ia64 \
+@@ -217,12 +217,8 @@ ifeq ($(SYSTEM_UNAME), Linux)
+     endif
+   endif
+ 
+-  # Need to maintain the jre/lib/i386 location for 32-bit Intel
+-  ifeq ($(ARCH), i586)
+-    LIBARCH = i386
+-  else
+-    LIBARCH = $(ARCH)
+-  endif
++  # Need to maintain the jre/lib/x86 location for 32-bit Intel
++  LIBARCH = $(ARCH)
+ 
+   # Value of Java os.arch property
+   ARCHPROP  = $(LIBARCH)
+diff --git openjdk/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
+index 73b6e0d..055c71d 100644
+--- openjdk/jdk/make/javax/sound/SoundDefs.gmk
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk
+@@ -70,9 +70,9 @@ else
+     CPPFLAGS += -DX_ARCH=X_ARM
+   endif # ARCH arm
+ 
+-  ifeq ($(ARCH), i586)
+-    CPPFLAGS += -DX_ARCH=X_I586
+-  endif # ARCH i586
++  ifeq ($(ARCH), x86)
++    CPPFLAGS += -DX_ARCH=X_X86
++  endif # ARCH x86
+ 
+   ifeq ($(ARCH), ia64)
+     CPPFLAGS += -DX_ARCH=X_IA64
+diff --git openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+index 2810548..4d00827 100644
+--- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+@@ -33,7 +33,7 @@
+ #define X_LINUX         3
+ 
+ // types for X_ARCH
+-#define X_I586          1
++#define X_X86          1
+ #define X_SPARC         2
+ #define X_SPARCV9       3
+ #define X_IA64          4
+diff --git openjdk/jdk/src/solaris/bin/i586/jvm.cfg openjdk/jdk/src/solaris/bin/i586/jvm.cfg
+deleted file mode 100644
+index 0f8fe07..0000000
+--- openjdk/jdk/src/solaris/bin/i586/jvm.cfg
++++ /dev/null
+@@ -1,38 +0,0 @@
+-# Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation.  Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-# List of JVMs that can be used as an option to java, javac, etc.
+-# Order is important -- first in this list is the default JVM.
+-# NOTE that this both this file and its format are UNSUPPORTED and
+-# WILL GO AWAY in a future release.
+-#
+-# You may also select a JVM in an arbitrary location with the
+-# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
+-# and may not be available in a future release.
+-#
+--client IF_SERVER_CLASS -server
+--server KNOWN
+--hotspot ALIASED_TO -client
+--classic WARN
+--native ERROR
+--green ERROR
+diff --git openjdk/jdk/src/solaris/bin/x86/jvm.cfg openjdk/jdk/src/solaris/bin/x86/jvm.cfg
+new file mode 100644
+index 0000000..0f8fe07
+--- /dev/null
++++ openjdk/jdk/src/solaris/bin/x86/jvm.cfg
+@@ -0,0 +1,38 @@
++# Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation.  Oracle designates this
++# particular file as subject to the "Classpath" exception as provided
++# by Oracle in the LICENSE file that accompanied this code.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++# List of JVMs that can be used as an option to java, javac, etc.
++# Order is important -- first in this list is the default JVM.
++# NOTE that this both this file and its format are UNSUPPORTED and
++# WILL GO AWAY in a future release.
++#
++# You may also select a JVM in an arbitrary location with the
++# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
++# and may not be available in a future release.
++#
++-client IF_SERVER_CLASS -server
++-server KNOWN
++-hotspot ALIASED_TO -client
++-classic WARN
++-native ERROR
++-green ERROR
+-- 
+1.7.7
+