diff options
Diffstat (limited to 'recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-sane-x86-arch.patch')
-rw-r--r-- | recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-sane-x86-arch.patch | 216 |
1 files changed, 0 insertions, 216 deletions
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-sane-x86-arch.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-sane-x86-arch.patch deleted file mode 100644 index af8b33e..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-sane-x86-arch.patch +++ /dev/null | |||
@@ -1,216 +0,0 @@ | |||
1 | From 662e11a8b6017f39ceb6d00dcdbfe11473b56174 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Fri, 23 Oct 2009 18:06:43 +0200 | ||
4 | Subject: [PATCH] sane-arch2 | ||
5 | |||
6 | --- | ||
7 | openjdk/jdk/make/common/shared/Compiler-gcc.gmk | 4 ++-- | ||
8 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | Index: openjdk/jdk/make/common/shared/Compiler-gcc.gmk | ||
11 | =================================================================== | ||
12 | --- openjdk/jdk/make/common/shared/Compiler-gcc.gmk.orig 2010-04-22 12:04:08.000000000 +0200 | ||
13 | +++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2010-04-22 12:13:53.335169757 +0200 | ||
14 | @@ -85,8 +85,8 @@ | ||
15 | REQUIRED_CC_VER = 3.2 | ||
16 | REQUIRED_GCC_VER = 3.2.* | ||
17 | endif | ||
18 | - ifeq ($(ARCH), i586) | ||
19 | - # i586 | ||
20 | + ifeq ($(ARCH), x86) | ||
21 | + # x86 | ||
22 | REQUIRED_CC_VER = 3.2 | ||
23 | REQUIRED_GCC_VER = 3.2.1* | ||
24 | REQUIRED_GCC_VER_INT = 3.2.1-7a | ||
25 | Index: openjdk/jdk/src/solaris/bin/i586/jvm.cfg | ||
26 | =================================================================== | ||
27 | --- openjdk/jdk/src/solaris/bin/i586/jvm.cfg 2010-02-17 04:14:46.000000000 +0100 | ||
28 | +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
29 | @@ -1,38 +0,0 @@ | ||
30 | -# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
31 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
32 | -# | ||
33 | -# This code is free software; you can redistribute it and/or modify it | ||
34 | -# under the terms of the GNU General Public License version 2 only, as | ||
35 | -# published by the Free Software Foundation. Sun designates this | ||
36 | -# particular file as subject to the "Classpath" exception as provided | ||
37 | -# by Sun in the LICENSE file that accompanied this code. | ||
38 | -# | ||
39 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
40 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
41 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
42 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
43 | -# accompanied this code). | ||
44 | -# | ||
45 | -# You should have received a copy of the GNU General Public License version | ||
46 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
47 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
48 | -# | ||
49 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
50 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
51 | -# have any questions. | ||
52 | -# | ||
53 | -# List of JVMs that can be used as an option to java, javac, etc. | ||
54 | -# Order is important -- first in this list is the default JVM. | ||
55 | -# NOTE that this both this file and its format are UNSUPPORTED and | ||
56 | -# WILL GO AWAY in a future release. | ||
57 | -# | ||
58 | -# You may also select a JVM in an arbitrary location with the | ||
59 | -# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
60 | -# and may not be available in a future release. | ||
61 | -# | ||
62 | --client IF_SERVER_CLASS -server | ||
63 | --server KNOWN | ||
64 | --hotspot ALIASED_TO -client | ||
65 | --classic WARN | ||
66 | --native ERROR | ||
67 | --green ERROR | ||
68 | Index: openjdk/jdk/src/solaris/bin/x86/jvm.cfg | ||
69 | =================================================================== | ||
70 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
71 | +++ openjdk/jdk/src/solaris/bin/x86/jvm.cfg 2010-04-22 12:12:10.545603344 +0200 | ||
72 | @@ -0,0 +1,38 @@ | ||
73 | +# Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. | ||
74 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
75 | +# | ||
76 | +# This code is free software; you can redistribute it and/or modify it | ||
77 | +# under the terms of the GNU General Public License version 2 only, as | ||
78 | +# published by the Free Software Foundation. Sun designates this | ||
79 | +# particular file as subject to the "Classpath" exception as provided | ||
80 | +# by Sun in the LICENSE file that accompanied this code. | ||
81 | +# | ||
82 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
83 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
84 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
85 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
86 | +# accompanied this code). | ||
87 | +# | ||
88 | +# You should have received a copy of the GNU General Public License version | ||
89 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
90 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
91 | +# | ||
92 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
93 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
94 | +# have any questions. | ||
95 | +# | ||
96 | +# List of JVMs that can be used as an option to java, javac, etc. | ||
97 | +# Order is important -- first in this list is the default JVM. | ||
98 | +# NOTE that this both this file and its format are UNSUPPORTED and | ||
99 | +# WILL GO AWAY in a future release. | ||
100 | +# | ||
101 | +# You may also select a JVM in an arbitrary location with the | ||
102 | +# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
103 | +# and may not be available in a future release. | ||
104 | +# | ||
105 | +-client IF_SERVER_CLASS -server | ||
106 | +-server KNOWN | ||
107 | +-hotspot ALIASED_TO -client | ||
108 | +-classic WARN | ||
109 | +-native ERROR | ||
110 | +-green ERROR | ||
111 | Index: openjdk/jdk/make/common/shared/Platform.gmk | ||
112 | =================================================================== | ||
113 | --- openjdk/jdk/make/common/shared/Platform.gmk.orig 2010-04-22 12:04:08.000000000 +0200 | ||
114 | +++ openjdk/jdk/make/common/shared/Platform.gmk 2010-04-22 12:16:43.848486263 +0200 | ||
115 | @@ -56,8 +56,8 @@ | ||
116 | # OS_VENDOR company name | ||
117 | # TEMP_DISK /tmp or C:/temp | ||
118 | # ARCH_DATA_MODEL 32 or 64 | ||
119 | -# ARCH sparc, sparcv9, i586, amd64, or ia64 | ||
120 | -# ARCH_FAMILY sparc or i586 | ||
121 | +# ARCH sparc, sparcv9, x86, amd64, or ia64 | ||
122 | +# ARCH_FAMILY sparc or x86 | ||
123 | # ARCHPROP sparc or x86 | ||
124 | # ARCH_VM_SUBDIR jre/bin, jre/lib/sparc, etc. | ||
125 | # LIBARCH sparc, sparcv9, i386, amd64, or ia64 | ||
126 | @@ -124,7 +124,7 @@ | ||
127 | processor := $(shell uname -p) | ||
128 | archExpr = case "$(processor)" in \ | ||
129 | i[3-9]86) \ | ||
130 | - echo i586 \ | ||
131 | + echo 586 \ | ||
132 | ;; \ | ||
133 | sparc*) \ | ||
134 | echo sparc \ | ||
135 | @@ -200,7 +200,7 @@ | ||
136 | endif | ||
137 | archExpr = case "$(mach)" in \ | ||
138 | i[3-9]86) \ | ||
139 | - echo i586 \ | ||
140 | + echo x86 \ | ||
141 | ;; \ | ||
142 | ia64) \ | ||
143 | echo ia64 \ | ||
144 | @@ -237,7 +237,7 @@ | ||
145 | ARCH=sparcv9 | ||
146 | endif | ||
147 | else | ||
148 | - # i586 is 32-bit, amd64 is 64-bit | ||
149 | + # x86 is 32-bit, amd64 is 64-bit | ||
150 | ifndef ARCH_DATA_MODEL | ||
151 | ifeq ($(ARCH), alpha) | ||
152 | ARCH_DATA_MODEL=64 | ||
153 | @@ -248,7 +248,7 @@ | ||
154 | ifeq ($(ARCH), arm) | ||
155 | ARCH_DATA_MODEL=32 | ||
156 | endif | ||
157 | - ifeq ($(ARCH), i586) | ||
158 | + ifeq ($(ARCH), x86) | ||
159 | ARCH_DATA_MODEL=32 | ||
160 | endif | ||
161 | ifeq ($(ARCH), ia64) | ||
162 | @@ -281,12 +281,7 @@ | ||
163 | endif | ||
164 | endif | ||
165 | |||
166 | - # Need to maintain the jre/lib/i386 location for 32-bit Intel | ||
167 | - ifeq ($(ARCH), i586) | ||
168 | - LIBARCH = i386 | ||
169 | - else | ||
170 | - LIBARCH = $(ARCH) | ||
171 | - endif | ||
172 | + LIBARCH = $(ARCH) | ||
173 | |||
174 | # Value of Java os.arch property | ||
175 | ARCHPROP = $(LIBARCH) | ||
176 | @@ -378,8 +373,8 @@ | ||
177 | REQUIRED_WINDOWS_VERSION=2000 or Unknown | ||
178 | #REQUIRED_WINDOWS_VERSION=XP Professional | ||
179 | # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel | ||
180 | - ARCH=i586 | ||
181 | - LIBARCH=i386 | ||
182 | + ARCH=x86 | ||
183 | + LIBARCH=x86 | ||
184 | # Value of Java os.arch property | ||
185 | ARCHPROP=x86 | ||
186 | endif | ||
187 | Index: icedtea6-1.8.11/openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h | ||
188 | =================================================================== | ||
189 | --- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-11-12 18:26:21.867320576 +0100 | ||
190 | +++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-11-12 19:42:57.310058108 +0100 | ||
191 | @@ -36,7 +36,7 @@ | ||
192 | #define X_ALPHA 1 | ||
193 | #define X_AMD64 2 | ||
194 | #define X_ARM 3 | ||
195 | -#define X_I586 4 | ||
196 | +#define X_X86 4 | ||
197 | #define X_IA64 5 | ||
198 | #define X_M68K 6 | ||
199 | #define X_MIPS 7 | ||
200 | Index: icedtea6-1.8.11/openjdk-ecj/jdk/make/javax/sound/SoundDefs.gmk | ||
201 | =================================================================== | ||
202 | --- openjdk/jdk/make/javax/sound/SoundDefs.gmk 2011-11-12 18:26:21.870653670 +0100 | ||
203 | +++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2011-11-12 20:00:37.693679490 +0100 | ||
204 | @@ -70,9 +70,9 @@ | ||
205 | CPPFLAGS += -DX_ARCH=X_ARM | ||
206 | endif # ARCH arm | ||
207 | |||
208 | - ifeq ($(ARCH), i586) | ||
209 | - CPPFLAGS += -DX_ARCH=X_I586 | ||
210 | - endif # ARCH i586 | ||
211 | + ifeq ($(ARCH), x86) | ||
212 | + CPPFLAGS += -DX_ARCH=X_X86 | ||
213 | + endif # ARCH x86 | ||
214 | |||
215 | ifeq ($(ARCH), ia64) | ||
216 | CPPFLAGS += -DX_ARCH=X_IA64 | ||