diff options
author | Jens Rehsack <rehsack@gmail.com> | 2015-10-16 19:29:38 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-10-19 10:12:53 -0200 |
commit | 2dcff5266a6c1ed39e49b24b8d2984a165ad9c35 (patch) | |
tree | 86757e1611e29bc17a3decf678f2c5e25c2ed0a6 /recipes-core | |
parent | a73939323984fca1e919d3408d3301ccdbceac9c (diff) | |
download | meta-java-2dcff5266a6c1ed39e49b24b8d2984a165ad9c35.tar.gz |
openjdk-6: remove
Since OpenJDK-6 is not maintained anymore, it's more reasonable to move to OpenJDK-8 instead
of sticking at unmaintained, upstream not supported VM version.
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-core')
91 files changed, 0 insertions, 6955 deletions
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/build-hacks-native.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/build-hacks-native.patch deleted file mode 100644 index 9432d03..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/build-hacks-native.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Index: icedtea6-1.6.1/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.6.1.orig/Makefile.am 2009-12-24 11:38:06.582572265 +0100 | ||
4 | +++ icedtea6-1.6.1/Makefile.am 2009-12-24 11:57:27.159578486 +0100 | ||
5 | @@ -265,6 +265,10 @@ | ||
6 | FT2_LIB="$(FREETYPE2_LIBS)" \ | ||
7 | ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ | ||
8 | HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | JAVAC="" \ | ||
14 | RHINO_JAR="$(RHINO_JAR)" \ | ||
15 | JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/disable-library-checks.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/disable-library-checks.patch deleted file mode 100644 index 23b8bed..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/disable-library-checks.patch +++ /dev/null | |||
@@ -1,141 +0,0 @@ | |||
1 | Index: icedtea6-1.7/configure.ac | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.7.orig/configure.ac 2010-01-26 04:52:18.000000000 +0100 | ||
4 | +++ icedtea6-1.7/configure.ac 2010-02-08 12:05:51.354556052 +0100 | ||
5 | @@ -205,9 +205,9 @@ | ||
6 | fi | ||
7 | |||
8 | dnl pkgconfig cannot be used to find these headers and libraries. | ||
9 | -AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] | ||
10 | - ,[AC_MSG_ERROR("CUPS headers were not found - | ||
11 | - try installing cups-devel.")]) | ||
12 | +#AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] | ||
13 | +# ,[AC_MSG_ERROR("CUPS headers were not found - | ||
14 | +# try installing cups-devel.")]) | ||
15 | AC_CHECK_HEADERS([X11/X.h],[] | ||
16 | ,[AC_MSG_ERROR("xorg headers were not found - | ||
17 | try installing xorg-x11-proto-devel.")]) | ||
18 | @@ -239,12 +239,12 @@ | ||
19 | AC_SUBST(XT_LIBS) | ||
20 | |||
21 | dnl Check for libXp headers and libraries. | ||
22 | -PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
23 | -if test "x${XP_FOUND}" = xno | ||
24 | -then | ||
25 | - AC_MSG_ERROR([Could not find Xp - \ | ||
26 | - Try installing libXp-devel.]) | ||
27 | -fi | ||
28 | +#PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) | ||
29 | +#if test "x${XP_FOUND}" = xno | ||
30 | +#then | ||
31 | +# AC_MSG_ERROR([Could not find Xp - \ | ||
32 | +# Try installing libXp-devel.]) | ||
33 | +#fi | ||
34 | AC_SUBST(XP_CFLAGS) | ||
35 | AC_SUBST(XP_LIBS) | ||
36 | |||
37 | @@ -258,16 +258,16 @@ | ||
38 | AC_SUBST(X11_CFLAGS) | ||
39 | AC_SUBST(X11_LIBS) | ||
40 | |||
41 | -dnl Check for libXinerama headers and libraries. | ||
42 | -PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
43 | - ,[XINERAMA_FOUND=no]) | ||
44 | -if test "x${XINERAMA_FOUND}" = xno | ||
45 | -then | ||
46 | - AC_MSG_ERROR([Could not find Xinerama - \ | ||
47 | - Try installing libXinerama-devel.]) | ||
48 | -fi | ||
49 | -AC_SUBST(XINERAMA_CFLAGS) | ||
50 | -AC_SUBST(XINERAMA_LIBS) | ||
51 | +#dnl Check for libXinerama headers and libraries. | ||
52 | +#PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] | ||
53 | +# ,[XINERAMA_FOUND=no]) | ||
54 | +#if test "x${XINERAMA_FOUND}" = xno | ||
55 | +#then | ||
56 | +# AC_MSG_ERROR([Could not find Xinerama - \ | ||
57 | +# Try installing libXinerama-devel.]) | ||
58 | +#fi | ||
59 | +#AC_SUBST(XINERAMA_CFLAGS) | ||
60 | +#AC_SUBST(XINERAMA_LIBS) | ||
61 | |||
62 | if test "x${ENABLE_XRENDER}" = "xyes" | ||
63 | then | ||
64 | @@ -341,26 +341,26 @@ | ||
65 | AC_CONFIG_FILES([tapset/jstack.stp]) | ||
66 | fi | ||
67 | |||
68 | -dnl Check for libpng headers and libraries. | ||
69 | -PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] | ||
70 | - ,[LIBPNG_FOUND=no]) | ||
71 | -if test "x${LIBPNG_FOUND}" = xno | ||
72 | -then | ||
73 | - AC_MSG_ERROR([Could not find libpng - \ | ||
74 | - Try installing libpng-devel.]) | ||
75 | -fi | ||
76 | -AC_SUBST(LIBPNG_CFLAGS) | ||
77 | -AC_SUBST(LIBPNG_LIBS) | ||
78 | - | ||
79 | -dnl Check for libXtst headers and libraries. | ||
80 | -PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
81 | -if test "x${XTST_FOUND}" = xno | ||
82 | -then | ||
83 | - AC_MSG_ERROR([Could not find Xtst - \ | ||
84 | - Try installing libXtst-devel.]) | ||
85 | -fi | ||
86 | -AC_SUBST(XTST_CFLAGS) | ||
87 | -AC_SUBST(XTST_LIBS) | ||
88 | +#dnl Check for libpng headers and libraries. | ||
89 | +#PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes] | ||
90 | +# ,[LIBPNG_FOUND=no]) | ||
91 | +#if test "x${LIBPNG_FOUND}" = xno | ||
92 | +#then | ||
93 | +# AC_MSG_ERROR([Could not find libpng - \ | ||
94 | +# Try installing libpng-devel.]) | ||
95 | +#fi | ||
96 | +#AC_SUBST(LIBPNG_CFLAGS) | ||
97 | +#AC_SUBST(LIBPNG_LIBS) | ||
98 | + | ||
99 | +#dnl Check for libXtst headers and libraries. | ||
100 | +#PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) | ||
101 | +#if test "x${XTST_FOUND}" = xno | ||
102 | +#then | ||
103 | +# AC_MSG_ERROR([Could not find Xtst - \ | ||
104 | +# Try installing libXtst-devel.]) | ||
105 | +#fi | ||
106 | +#AC_SUBST(XTST_CFLAGS) | ||
107 | +#AC_SUBST(XTST_LIBS) | ||
108 | |||
109 | dnl Check for freetype2 headers and libraries. | ||
110 | PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] | ||
111 | @@ -373,18 +373,18 @@ | ||
112 | AC_SUBST(FREETYPE2_CFLAGS) | ||
113 | AC_SUBST(FREETYPE2_LIBS) | ||
114 | |||
115 | -dnl Check for alsa headers and libraries (only required for Linux). | ||
116 | -if test "x${BUILD_OS_DIR}" = "xlinux" | ||
117 | -then | ||
118 | - PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
119 | - if test "x${ALSA_FOUND}" = xno | ||
120 | - then | ||
121 | - AC_MSG_ERROR([Could not find alsa - \ | ||
122 | - Try installing alsa-lib-devel.]) | ||
123 | - fi | ||
124 | -AC_SUBST(ALSA_CFLAGS) | ||
125 | -AC_SUBST(ALSA_LIBS) | ||
126 | -fi | ||
127 | +#dnl Check for alsa headers and libraries (only required for Linux). | ||
128 | +#if test "x${BUILD_OS_DIR}" = "xlinux" | ||
129 | +#then | ||
130 | +# PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) | ||
131 | +# if test "x${ALSA_FOUND}" = xno | ||
132 | +# then | ||
133 | +# AC_MSG_ERROR([Could not find alsa - \ | ||
134 | +# Try installing alsa-lib-devel.]) | ||
135 | +# fi | ||
136 | +#AC_SUBST(ALSA_CFLAGS) | ||
137 | +#AC_SUBST(ALSA_LIBS) | ||
138 | +#fi | ||
139 | |||
140 | if test "x${enable_pulse_java}" = "xyes" | ||
141 | then | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-disable-compilation.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-disable-compilation.patch deleted file mode 100644 index cd0f68a..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-disable-compilation.patch +++ /dev/null | |||
@@ -1,513 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/sun/awt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/sun/awt/Makefile 2009-04-24 09:33:55.000000000 +0200 | ||
4 | +++ openjdk/jdk/make/sun/awt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
5 | @@ -180,7 +180,8 @@ | ||
6 | include $(BUILDDIR)/common/Mapfile-vers.gmk | ||
7 | include $(BUILDDIR)/common/Library.gmk | ||
8 | |||
9 | -build: fontconfigs | ||
10 | +#build: fontconfigs | ||
11 | +build: | ||
12 | |||
13 | |||
14 | ifeq ($(PLATFORM), windows) | ||
15 | @@ -535,9 +536,9 @@ | ||
16 | -I$(PLATFORM_SRC)/native/$(PKGDIR) \ | ||
17 | $(EVENT_MODEL) | ||
18 | |||
19 | -ifeq ($(PLATFORM), linux) | ||
20 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
21 | -endif | ||
22 | +#ifeq ($(PLATFORM), linux) | ||
23 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
24 | +#endif | ||
25 | |||
26 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
27 | $(AWT_RUNPATH) | ||
28 | Index: openjdk/jdk/make/javax/sound/jsoundalsa/Makefile | ||
29 | =================================================================== | ||
30 | --- openjdk.orig/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:48:34.534565581 +0200 | ||
31 | +++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
32 | @@ -44,34 +44,35 @@ | ||
33 | # Files | ||
34 | # | ||
35 | |||
36 | -FILES_c = \ | ||
37 | - Utilities.c \ | ||
38 | - $(DAUDIOFILES_c) \ | ||
39 | - $(MIDIFILES_c) \ | ||
40 | - $(PORTFILES_c) | ||
41 | +#FILES_c = \ | ||
42 | +# Utilities.c \ | ||
43 | +# $(DAUDIOFILES_c) \ | ||
44 | +# $(MIDIFILES_c) \ | ||
45 | +# $(PORTFILES_c) | ||
46 | |||
47 | # platform dependent files | ||
48 | -FILES_c += \ | ||
49 | - PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
50 | - PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
51 | - PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
52 | - PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
53 | - PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
54 | - PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
55 | - PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
56 | - | ||
57 | -FILES_export = \ | ||
58 | - $(DAUDIOFILES_export) \ | ||
59 | - $(MIDIFILES_export) \ | ||
60 | - $(PORTFILES_export) | ||
61 | +#FILES_c += \ | ||
62 | +# PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ | ||
63 | +# PLATFORM_API_LinuxOS_ALSA_PCM.c \ | ||
64 | +# PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ | ||
65 | +# PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ | ||
66 | +# PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ | ||
67 | +# PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ | ||
68 | +# PLATFORM_API_LinuxOS_ALSA_Ports.c | ||
69 | + | ||
70 | +FILES_export = | ||
71 | +#FILES_export = \ | ||
72 | +# $(DAUDIOFILES_export) \ | ||
73 | +# $(MIDIFILES_export) \ | ||
74 | +# $(PORTFILES_export) | ||
75 | |||
76 | -OTHER_LDLIBS += -lasound | ||
77 | +#OTHER_LDLIBS += -lasound | ||
78 | |||
79 | CPPFLAGS += \ | ||
80 | - -DUSE_DAUDIO=TRUE \ | ||
81 | - -DUSE_PORTS=TRUE \ | ||
82 | - -DUSE_PLATFORM_MIDI_OUT=TRUE \ | ||
83 | - -DUSE_PLATFORM_MIDI_IN=TRUE \ | ||
84 | + -DUSE_DAUDIO=FALSE \ | ||
85 | + -DUSE_PORTS=FALSE \ | ||
86 | + -DUSE_PLATFORM_MIDI_OUT=FALSE \ | ||
87 | + -DUSE_PLATFORM_MIDI_IN=FALSE \ | ||
88 | -I$(SHARE_SRC)/native/com/sun/media/sound | ||
89 | |||
90 | # | ||
91 | Index: openjdk/jdk/make/sun/splashscreen/Makefile | ||
92 | =================================================================== | ||
93 | --- openjdk.orig/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:48:33.738565601 +0200 | ||
94 | +++ openjdk/jdk/make/sun/splashscreen/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
95 | @@ -32,7 +32,8 @@ | ||
96 | # | ||
97 | # Files | ||
98 | # | ||
99 | -include FILES_c.gmk | ||
100 | +#include FILES_c.gmk | ||
101 | +FILES_c = | ||
102 | |||
103 | FILES_java = \ | ||
104 | java/awt/SplashScreen.java | ||
105 | @@ -62,9 +63,9 @@ | ||
106 | CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE | ||
107 | |||
108 | ifneq ($(PLATFORM), windows) | ||
109 | - CFLAGS += -DWITH_X11 | ||
110 | - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
111 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
112 | +# CFLAGS += -DWITH_X11 | ||
113 | +# CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
114 | +# OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
115 | else # PLATFORM | ||
116 | CFLAGS += -DWITH_WIN32 | ||
117 | OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib | ||
118 | @@ -79,7 +80,7 @@ | ||
119 | vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg | ||
120 | vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen | ||
121 | |||
122 | -CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
123 | +#CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen | ||
124 | |||
125 | ifeq ($(PLATFORM), linux) | ||
126 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
127 | Index: openjdk/jdk/make/sun/xawt/Makefile | ||
128 | =================================================================== | ||
129 | --- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-04-24 09:33:56.000000000 +0200 | ||
130 | +++ openjdk/jdk/make/sun/xawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
131 | @@ -41,15 +41,16 @@ | ||
132 | # | ||
133 | # Files | ||
134 | # | ||
135 | -include FILES_c_unix.gmk | ||
136 | -include FILES_export_unix.gmk | ||
137 | +#include FILES_c_unix.gmk | ||
138 | +FILES_c = | ||
139 | +#include FILES_export_unix.gmk | ||
140 | AUTO_FILES_JAVA_DIRS = sun/awt/X11 | ||
141 | AUTO_JAVA_PRUNE = WrapperGenerator.java | ||
142 | |||
143 | LDFLAGS += -L$(OPENWIN_LIB) | ||
144 | |||
145 | ifeq ($(PLATFORM), linux) | ||
146 | -LDFLAGS += -lpthread | ||
147 | +#LDFLAGS += -lpthread | ||
148 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
149 | endif | ||
150 | |||
151 | @@ -86,16 +87,19 @@ | ||
152 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl | ||
153 | vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 | ||
154 | |||
155 | -OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
156 | - $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
157 | +#OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ | ||
158 | +# $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi | ||
159 | |||
160 | ifeq ($(PLATFORM), solaris) | ||
161 | CPPFLAGS += -DFUNCPROTO=15 | ||
162 | dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) | ||
163 | endif | ||
164 | |||
165 | -CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
166 | +#CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
167 | |||
168 | +# Normally we would like to patch these includes away but | ||
169 | +# we need them for the successfull compilation of the sizer | ||
170 | +# executables. | ||
171 | CPPFLAGS += -DXAWT -DXAWT_HACK \ | ||
172 | -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ | ||
173 | -I$(PLATFORM_SRC)/native/sun/awt \ | ||
174 | @@ -124,10 +128,10 @@ | ||
175 | |||
176 | ifeq ($(PLATFORM), linux) | ||
177 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
178 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
179 | - -I/usr/include/X11/extensions \ | ||
180 | - -I$(MOTIF_DIR)/include \ | ||
181 | - -I$(OPENWIN_HOME)/include | ||
182 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
183 | +# -I/usr/include/X11/extensions \ | ||
184 | +# -I$(MOTIF_DIR)/include \ | ||
185 | +# -I$(OPENWIN_HOME)/include | ||
186 | endif | ||
187 | |||
188 | ifeq ($(PLATFORM), solaris) | ||
189 | @@ -238,18 +242,20 @@ | ||
190 | $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) | ||
191 | |||
192 | $(SIZES): $(SIZERS) | ||
193 | - @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
194 | - $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
195 | - $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
196 | - $(CHMOD) +w $@;\ | ||
197 | - else \ | ||
198 | - $(ECHO) GENERATING $@; \ | ||
199 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
200 | - fi | ||
201 | - @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
202 | - $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
203 | - $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
204 | - fi | ||
205 | + touch $(SIZES) | ||
206 | +# | ||
207 | +# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
208 | +# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
209 | +# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
210 | +# $(CHMOD) +w $@;\ | ||
211 | +# else \ | ||
212 | +# $(ECHO) GENERATING $@; \ | ||
213 | +# $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
214 | +# fi | ||
215 | +# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
216 | +# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
217 | +# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
218 | +# fi | ||
219 | |||
220 | $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) | ||
221 | $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ | ||
222 | Index: openjdk/jdk/make/sun/jawt/Makefile | ||
223 | =================================================================== | ||
224 | --- openjdk.orig/jdk/make/sun/jawt/Makefile 2009-09-29 13:48:34.186565471 +0200 | ||
225 | +++ openjdk/jdk/make/sun/jawt/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
226 | @@ -36,7 +36,8 @@ | ||
227 | ifeq ($(PLATFORM), windows) | ||
228 | FILES_cpp = jawt.cpp | ||
229 | else # PLATFORM | ||
230 | -FILES_c = jawt.c | ||
231 | +FILES_c = | ||
232 | +#FILES_c = jawt.c | ||
233 | endif # PLATFORM | ||
234 | |||
235 | FILES_h = $(INCLUDEDIR)/jawt.h \ | ||
236 | Index: openjdk/jdk/make/sun/jpeg/Makefile | ||
237 | =================================================================== | ||
238 | --- openjdk.orig/jdk/make/sun/jpeg/Makefile 2009-09-29 13:48:33.726565626 +0200 | ||
239 | +++ openjdk/jdk/make/sun/jpeg/Makefile 2009-09-29 13:57:14.446815782 +0200 | ||
240 | @@ -37,7 +37,8 @@ | ||
241 | # | ||
242 | # Files | ||
243 | # | ||
244 | -include FILES_c.gmk | ||
245 | +FILES_c = | ||
246 | +#include FILES_c.gmk | ||
247 | |||
248 | AUTO_FILES_JAVA_DIRS = sun/awt/image com/sun/imageio/plugins/jpeg | ||
249 | |||
250 | Index: openjdk/jdk/make/common/shared/Defs-java.gmk | ||
251 | =================================================================== | ||
252 | --- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:48:55.954565215 +0200 | ||
253 | +++ openjdk/jdk/make/common/shared/Defs-java.gmk 2009-09-29 13:57:14.446815782 +0200 | ||
254 | @@ -36,14 +36,14 @@ | ||
255 | # Memory related -J flags that all uses of java tools should use. | ||
256 | # | ||
257 | JAVA_MEM_FLAGS = -Xmx$(MAX_VM_MEMORY)m | ||
258 | -ifneq (,$(filter $(ARCH), ia64 s390)) | ||
259 | +#ifneq (,$(filter $(ARCH), ia64 s390)) | ||
260 | # Special flags for javac on ia64 to work around a VM problem with | ||
261 | # bad code generation during inlining (what version had this problem?): | ||
262 | # Suspect this may not be needed anymore. | ||
263 | - JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
264 | -else | ||
265 | - JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
266 | -endif | ||
267 | +# JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline | ||
268 | +#else | ||
269 | +# JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m | ||
270 | +#endif | ||
271 | |||
272 | # | ||
273 | # All java tools (javac, javah, and javadoc) run faster with certain java | ||
274 | Index: openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java | ||
275 | =================================================================== | ||
276 | --- openjdk.orig/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-04-24 09:34:04.000000000 +0200 | ||
277 | +++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2009-09-29 13:57:14.450815511 +0200 | ||
278 | @@ -113,7 +113,7 @@ | ||
279 | * @since 1.4 | ||
280 | */ | ||
281 | public static boolean isHeadless() { | ||
282 | - return getHeadlessProperty(); | ||
283 | + return true; | ||
284 | } | ||
285 | |||
286 | /** | ||
287 | Index: openjdk/corba/make/common/Defs.gmk | ||
288 | =================================================================== | ||
289 | --- openjdk.orig/corba/make/common/Defs.gmk 2009-04-24 09:30:19.000000000 +0200 | ||
290 | +++ openjdk/corba/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
291 | @@ -444,11 +444,11 @@ | ||
292 | # Tool flags | ||
293 | # | ||
294 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
295 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
296 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
297 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
298 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
299 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
300 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
301 | $(DEFINES) $(OPTIONS:%=-D%) | ||
302 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
303 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
304 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
305 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
306 | $(OTHER_LINTFLAGS) | ||
307 | Index: openjdk/jdk/make/common/Defs.gmk | ||
308 | =================================================================== | ||
309 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:48:33.590565061 +0200 | ||
310 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
311 | @@ -662,11 +662,11 @@ | ||
312 | # Tool flags | ||
313 | # | ||
314 | ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS) | ||
315 | -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) | ||
316 | -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) | ||
317 | -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \ | ||
318 | +CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(OE_CFLAGS) | ||
319 | +CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS) $(OE_CXXFLAGS) | ||
320 | +CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) $(OE_CPPFLAGS) \ | ||
321 | $(DEFINES) $(OPTIONS:%=-D%) | ||
322 | -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) | ||
323 | +LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS) $(OE_LDFLAGS) | ||
324 | LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON) | ||
325 | LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \ | ||
326 | $(OTHER_LINTFLAGS) | ||
327 | Index: openjdk/hotspot/make/linux/makefiles/vm.make | ||
328 | =================================================================== | ||
329 | --- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:48:34.098565716 +0200 | ||
330 | +++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-09-29 13:57:14.450815511 +0200 | ||
331 | @@ -170,6 +170,7 @@ | ||
332 | LIBS_VM += $(LLVM_LIBS) | ||
333 | endif | ||
334 | |||
335 | +LFLAGS_VM = $(OE_LDFLAGS) | ||
336 | LINK_VM = $(LINK_LIB.c) | ||
337 | |||
338 | # rule for building precompiled header | ||
339 | Index: openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c | ||
340 | =================================================================== | ||
341 | --- openjdk.orig/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-04-24 09:34:34.000000000 +0200 | ||
342 | +++ openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2009-09-29 13:57:14.450815511 +0200 | ||
343 | @@ -26,8 +26,10 @@ | ||
344 | #include <jni.h> | ||
345 | #include <jni_util.h> | ||
346 | #include <dlfcn.h> | ||
347 | +#if 0 | ||
348 | #include <cups/cups.h> | ||
349 | #include <cups/ppd.h> | ||
350 | +#endif | ||
351 | |||
352 | //#define CUPS_DEBUG | ||
353 | |||
354 | @@ -37,6 +39,7 @@ | ||
355 | #define DPRINTF(x, y) | ||
356 | #endif | ||
357 | |||
358 | +#if 0 | ||
359 | typedef const char* (*fn_cupsServer)(void); | ||
360 | typedef int (*fn_ippPort)(void); | ||
361 | typedef http_t* (*fn_httpConnect)(const char *, int); | ||
362 | @@ -56,7 +59,7 @@ | ||
363 | fn_ppdClose j2d_ppdClose; | ||
364 | fn_ppdFindOption j2d_ppdFindOption; | ||
365 | fn_ppdPageSize j2d_ppdPageSize; | ||
366 | - | ||
367 | +#endif | ||
368 | |||
369 | /* | ||
370 | * Initialize library functions. | ||
371 | @@ -65,6 +68,7 @@ | ||
372 | JNIEXPORT jboolean JNICALL | ||
373 | Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env, | ||
374 | jobject printObj) { | ||
375 | +#if 0 | ||
376 | void *handle = dlopen("libcups.so.2", RTLD_LAZY | RTLD_GLOBAL); | ||
377 | |||
378 | if (handle == NULL) { | ||
379 | @@ -131,6 +135,8 @@ | ||
380 | } | ||
381 | |||
382 | return JNI_TRUE; | ||
383 | +#endif | ||
384 | + return JNI_FALSE; | ||
385 | } | ||
386 | |||
387 | /* | ||
388 | @@ -141,6 +147,7 @@ | ||
389 | Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env, | ||
390 | jobject printObj) | ||
391 | { | ||
392 | +#if 0 | ||
393 | jstring cServer = NULL; | ||
394 | const char* server = j2d_cupsServer(); | ||
395 | if (server != NULL) { | ||
396 | @@ -152,6 +159,8 @@ | ||
397 | } | ||
398 | } | ||
399 | return cServer; | ||
400 | +#endif | ||
401 | + return NULL; | ||
402 | } | ||
403 | |||
404 | /* | ||
405 | @@ -162,8 +171,11 @@ | ||
406 | Java_sun_print_CUPSPrinter_getCupsPort(JNIEnv *env, | ||
407 | jobject printObj) | ||
408 | { | ||
409 | +#if 0 | ||
410 | int port = j2d_ippPort(); | ||
411 | return (jint) port; | ||
412 | +#endif | ||
413 | + return 0; | ||
414 | } | ||
415 | |||
416 | |||
417 | @@ -177,6 +189,7 @@ | ||
418 | jstring server, | ||
419 | jint port) | ||
420 | { | ||
421 | +#if 0 | ||
422 | const char *serverName; | ||
423 | serverName = (*env)->GetStringUTFChars(env, server, NULL); | ||
424 | if (serverName != NULL) { | ||
425 | @@ -187,6 +200,7 @@ | ||
426 | return JNI_TRUE; | ||
427 | } | ||
428 | } | ||
429 | +#endif | ||
430 | return JNI_FALSE; | ||
431 | } | ||
432 | |||
433 | @@ -199,6 +213,7 @@ | ||
434 | jobject printObj, | ||
435 | jstring printer) | ||
436 | { | ||
437 | +#if 0 | ||
438 | ppd_file_t *ppd; | ||
439 | ppd_option_t *optionTray, *optionPage; | ||
440 | ppd_choice_t *choice; | ||
441 | @@ -304,6 +319,8 @@ | ||
442 | j2d_ppdClose(ppd); | ||
443 | unlink(filename); | ||
444 | return nameArray; | ||
445 | +#endif | ||
446 | + return NULL; | ||
447 | } | ||
448 | |||
449 | |||
450 | @@ -315,6 +332,7 @@ | ||
451 | jobject printObj, | ||
452 | jstring printer) | ||
453 | { | ||
454 | +#if 0 | ||
455 | ppd_file_t *ppd; | ||
456 | ppd_option_t *option; | ||
457 | ppd_choice_t *choice; | ||
458 | @@ -374,4 +392,6 @@ | ||
459 | j2d_ppdClose(ppd); | ||
460 | unlink(filename); | ||
461 | return sizeArray; | ||
462 | +#endif | ||
463 | + return NULL; | ||
464 | } | ||
465 | Index: openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java | ||
466 | =================================================================== | ||
467 | --- openjdk.orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-04-24 09:34:17.000000000 +0200 | ||
468 | +++ openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
469 | @@ -244,6 +244,8 @@ | ||
470 | * that might be specified. | ||
471 | */ | ||
472 | fontConfig = createFontConfiguration(); | ||
473 | + if (fontConfig == null) | ||
474 | + return null; | ||
475 | getPlatformFontPathFromFontConfig(); | ||
476 | |||
477 | String extraFontPath = fontConfig.getExtraFontPath(); | ||
478 | Index: openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java | ||
479 | =================================================================== | ||
480 | --- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-04-24 09:34:33.000000000 +0200 | ||
481 | +++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java 2009-09-29 13:57:14.454815276 +0200 | ||
482 | @@ -899,7 +899,8 @@ | ||
483 | |||
484 | // Implements SunGraphicsEnvironment.createFontConfiguration. | ||
485 | protected FontConfiguration createFontConfiguration() { | ||
486 | - return new MFontConfiguration(this); | ||
487 | +// return new MFontConfiguration(this); | ||
488 | + return null; | ||
489 | } | ||
490 | public FontConfiguration | ||
491 | createFontConfiguration(boolean preferLocaleFonts, | ||
492 | Index: openjdk/jdk/make/launchers/Makefile | ||
493 | =================================================================== | ||
494 | --- openjdk.orig/jdk/make/launchers/Makefile 2009-09-29 13:48:33.490815135 +0200 | ||
495 | +++ openjdk/jdk/make/launchers/Makefile 2009-09-29 13:57:14.454815276 +0200 | ||
496 | @@ -57,7 +57,7 @@ | ||
497 | endif | ||
498 | # Run MAKE $@ for all generic launchers | ||
499 | define make-all-launchers | ||
500 | -$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
501 | +#$(call make-launcher, appletviewer, sun.applet.Main, , ) | ||
502 | $(call make-launcher, apt, com.sun.tools.apt.Main, , ) | ||
503 | $(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , ) | ||
504 | $(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , ) | ||
505 | @@ -93,7 +93,7 @@ | ||
506 | -J-Dcom.sun.CORBA.activation.Port=1049 \ | ||
507 | -J-Dcom.sun.CORBA.POA.ORBServerId=1, ) | ||
508 | $(call make-launcher, pack200, com.sun.java.util.jar.pack.Driver, , --pack) | ||
509 | -$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
510 | +#$(call make-launcher, policytool, sun.security.tools.PolicyTool, , ) | ||
511 | $(call make-launcher, rmic, sun.rmi.rmic.Main, , ) | ||
512 | $(call make-launcher, rmid, sun.rmi.server.Activation, , ) | ||
513 | $(call make-launcher, rmiregistry, sun.rmi.registry.RegistryImpl, , ) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-freetype.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-freetype.patch deleted file mode 100644 index 3420fbd..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-freetype.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/tools/freetypecheck/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/tools/freetypecheck/Makefile 2009-09-29 13:48:33.590565061 +0200 | ||
4 | +++ openjdk/jdk/make/tools/freetypecheck/Makefile 2009-09-29 14:00:04.470566156 +0200 | ||
5 | @@ -45,7 +45,7 @@ | ||
6 | FT_OPTIONS = $(CFLAGS) | ||
7 | endif | ||
8 | |||
9 | -FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2 | ||
10 | +FT_OPTIONS += -I$(FT_HEADERS) -I$(FT_HEADERS)/freetype2 $(FREETYPE2_CFLAGS) $(FREETYPE2_LIBS) $(FREETYPE2_HEADERS) | ||
11 | FT_OPTIONS += $(XARCH) | ||
12 | |||
13 | #add runtime library search path | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch deleted file mode 100644 index eff7e48..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-ecj-fix-zlib.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/com/sun/java/pack/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2009-09-29 13:48:34.538565136 +0200 | ||
4 | +++ openjdk/jdk/make/com/sun/java/pack/Makefile 2009-09-29 14:00:26.226565853 +0200 | ||
5 | @@ -80,7 +80,7 @@ | ||
6 | OTHER_LDLIBS += $(JVMLIB) | ||
7 | endif | ||
8 | |||
9 | -OTHER_LDLIBS += -lz | ||
10 | +OTHER_LDLIBS += -L$(libdir) -lz | ||
11 | CXXFLAGS_DBG += -DFULL | ||
12 | CXXFLAGS_OPT += -DPRODUCT | ||
13 | CXXFLAGS_COMMON += -DFULL | ||
14 | Index: openjdk/jdk/make/common/Defs.gmk | ||
15 | =================================================================== | ||
16 | --- openjdk.orig/jdk/make/common/Defs.gmk 2009-09-29 13:57:14.450815511 +0200 | ||
17 | +++ openjdk/jdk/make/common/Defs.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
18 | @@ -289,7 +289,7 @@ | ||
19 | |||
20 | endif # PROGRAM | ||
21 | |||
22 | -LDLIBS_COMMON += $(EXTRA_LIBS) | ||
23 | +LDLIBS_COMMON += $(EXTRA_LIBS) -L$(libdir) | ||
24 | |||
25 | # | ||
26 | # Default is to build, not import native binaries | ||
27 | @@ -425,7 +425,7 @@ | ||
28 | CLASSDESTDIR = $(CLASSBINDIR) | ||
29 | endif | ||
30 | |||
31 | -INCLUDES = -I. -I$(CLASSHDRDIR) \ | ||
32 | +INCLUDES = -I$(includedir) -I. -I$(CLASSHDRDIR) \ | ||
33 | $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES) | ||
34 | OTHER_CPPFLAGS = $(INCLUDES) | ||
35 | |||
36 | Index: openjdk/jdk/make/common/Program.gmk | ||
37 | =================================================================== | ||
38 | --- openjdk.orig/jdk/make/common/Program.gmk 2009-09-29 13:48:33.914565255 +0200 | ||
39 | +++ openjdk/jdk/make/common/Program.gmk 2009-09-29 14:00:26.226565853 +0200 | ||
40 | @@ -73,7 +73,7 @@ | ||
41 | # itself, as with all the Windows libraries. | ||
42 | # | ||
43 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
44 | - LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli | ||
45 | + LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli -L $(libdir) | ||
46 | OTHER_LDLIBS += -ljli | ||
47 | ifeq ($(PLATFORM), solaris) | ||
48 | ifeq ($(ARCH_DATA_MODEL), 32) | ||
49 | Index: openjdk/jdk/make/java/jli/Makefile | ||
50 | =================================================================== | ||
51 | --- openjdk.orig/jdk/make/java/jli/Makefile 2009-09-29 13:48:33.806565054 +0200 | ||
52 | +++ openjdk/jdk/make/java/jli/Makefile 2009-09-29 14:00:26.230565844 +0200 | ||
53 | @@ -61,7 +61,7 @@ | ||
54 | ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems | ||
55 | LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli | ||
56 | # Guarantee very limited dependencies | ||
57 | - LDLIBS = -lz -lc | ||
58 | + LDLIBS = -L$(libdir) -lz -lc | ||
59 | endif | ||
60 | |||
61 | ifeq ($(PLATFORM), windows) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-fix-jar-path.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-fix-jar-path.patch deleted file mode 100644 index 57543fb..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-fix-jar-path.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: icedtea6-1.8.11/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.11.orig/Makefile.am 2011-12-20 00:49:21.000000000 +0100 | ||
4 | +++ icedtea6-1.8.11/Makefile.am 2011-12-20 01:07:08.431134312 +0100 | ||
5 | @@ -1877,7 +1877,7 @@ | ||
6 | stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR) | ||
7 | if WITH_RHINO | ||
8 | mkdir -p rhino/rhino.{old,new} | ||
9 | - (cd rhino/rhino.old ; jar xf $(RHINO_JAR)) | ||
10 | + (cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) | ||
11 | $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \ | ||
12 | com.redhat.rewriter.ClassRewriter \ | ||
13 | $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \ | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-dont-return-booleans.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-dont-return-booleans.patch deleted file mode 100644 index 73f90b3..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-dont-return-booleans.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | diff -Nurd openjdk/hotspot/src/share/vm/opto/loopnode.cpp openjdk/hotspot/src/share/vm/opto/loopnode.cpp | ||
2 | --- openjdk/hotspot/src/share/vm/opto/loopnode.cpp 2012-10-05 14:18:19.725747261 +0200 | ||
3 | +++ openjdk/hotspot/src/share/vm/opto/loopnode.cpp 2012-10-05 14:18:40.751035242 +0200 | ||
4 | @@ -534,7 +534,7 @@ | ||
5 | Node* CountedLoopNode::match_incr_with_optional_truncation( | ||
6 | Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) { | ||
7 | // Quick cutouts: | ||
8 | - if (expr == NULL || expr->req() != 3) return false; | ||
9 | + if (expr == NULL || expr->req() != 3) return NULL; | ||
10 | |||
11 | Node *t1 = NULL; | ||
12 | Node *t2 = NULL; | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-make-arch-sane-for-x86.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-make-arch-sane-for-x86.patch deleted file mode 100644 index 9d7b9bb..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-hotspot-make-arch-sane-for-x86.patch +++ /dev/null | |||
@@ -1,1130 +0,0 @@ | |||
1 | From b8a51665ada45e3beb0823c03c025d5514f5e745 Mon Sep 17 00:00:00 2001 | ||
2 | From: woglinde <woglinde@rhein.zuhause.netz> | ||
3 | Date: Thu, 22 Oct 2009 16:35:25 +0200 | ||
4 | Subject: [PATCH] hotspot: make arch sane for x86 | ||
5 | |||
6 | diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh | ||
7 | index 38e0f78..64c8410 100644 | ||
8 | --- openjdk/hotspot/agent/make/saenv.sh | ||
9 | +++ openjdk/hotspot/agent/make/saenv.sh | ||
10 | @@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then | ||
11 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
12 | CPU=amd64 | ||
13 | else | ||
14 | - SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | ||
15 | + SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 | ||
16 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
17 | - CPU=i386 | ||
18 | + CPU=x86 | ||
19 | fi | ||
20 | else | ||
21 | SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | ||
22 | diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make | ||
23 | index 83ddd1a..c20c7eb 100644 | ||
24 | --- openjdk/hotspot/make/defs.make | ||
25 | +++ openjdk/hotspot/make/defs.make | ||
26 | @@ -207,7 +207,7 @@ ifneq ($(OSNAME),windows) | ||
27 | ifdef LP64 | ||
28 | BUILDARCH = amd64 | ||
29 | else | ||
30 | - BUILDARCH = i486 | ||
31 | + BUILDARCH = x86 | ||
32 | endif | ||
33 | endif | ||
34 | ifeq ($(BUILDARCH), sparc) | ||
35 | @@ -218,7 +218,7 @@ ifneq ($(OSNAME),windows) | ||
36 | |||
37 | # LIBARCH is 1:1 mapping from BUILDARCH | ||
38 | LIBARCH = $(LIBARCH/$(BUILDARCH)) | ||
39 | - LIBARCH/i486 = i386 | ||
40 | + LIBARCH/x86 = x86 | ||
41 | LIBARCH/amd64 = amd64 | ||
42 | LIBARCH/sparc = sparc | ||
43 | LIBARCH/sparcv9 = sparcv9 | ||
44 | diff --git openjdk/hotspot/make/jprt.config openjdk/hotspot/make/jprt.config | ||
45 | index bc82543..4a1ef4e 100644 | ||
46 | --- openjdk/hotspot/make/jprt.config | ||
47 | +++ openjdk/hotspot/make/jprt.config | ||
48 | @@ -111,7 +111,7 @@ elif [ "${osname}" = Linux ] ; then | ||
49 | # LINUX: X86, AMD64 | ||
50 | osarch=`uname -m` | ||
51 | if [ "${osarch}" = i686 ] ; then | ||
52 | - linux_arch=i586 | ||
53 | + linux_arch=x86 | ||
54 | elif [ "${osarch}" = x86_64 ] ; then | ||
55 | linux_arch=amd64 | ||
56 | fi | ||
57 | diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties | ||
58 | index eb2ce82..7193de0 100644 | ||
59 | --- openjdk/hotspot/make/jprt.properties | ||
60 | +++ openjdk/hotspot/make/jprt.properties | ||
61 | @@ -70,7 +70,7 @@ jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10 | ||
62 | jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 | ||
63 | jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} | ||
64 | |||
65 | -jprt.my.linux.i586=linux_i586 | ||
66 | +jprt.my.linux.x86=linux_x86 | ||
67 | jprt.my.linux.x64=linux_x64 | ||
68 | jprt.my.windows.i586=windows_i586 | ||
69 | jprt.my.windows.x64=windows_x64 | ||
70 | @@ -201,30 +201,30 @@ jprt.my.solaris.i586.test.targets= \ | ||
71 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \ | ||
72 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3 | ||
73 | |||
74 | -jprt.my.linux.i586.test.targets = \ | ||
75 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
76 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
77 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ | ||
78 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \ | ||
79 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \ | ||
80 | - ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ | ||
81 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ | ||
82 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \ | ||
83 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
84 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
85 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
86 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
87 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
88 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ | ||
89 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ | ||
90 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
91 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
92 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ | ||
93 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ | ||
94 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
95 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ | ||
96 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \ | ||
97 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3 | ||
98 | +jprt.my.linux.x86.test.targets = \ | ||
99 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
100 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
101 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ | ||
102 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_2, \ | ||
103 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_3, \ | ||
104 | + ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ | ||
105 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ | ||
106 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp_2, \ | ||
107 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
108 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
109 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
110 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
111 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
112 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ | ||
113 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ | ||
114 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
115 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
116 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ | ||
117 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ | ||
118 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
119 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ | ||
120 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_2, \ | ||
121 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_3 | ||
122 | |||
123 | jprt.my.linux.x64.test.targets = \ | ||
124 | ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ | ||
125 | @@ -294,7 +294,7 @@ jprt.test.targets = \ | ||
126 | ${jprt.my.solaris.sparcv9.test.targets}, \ | ||
127 | ${jprt.my.solaris.i586.test.targets}, \ | ||
128 | ${jprt.my.solaris.x64.test.targets}, \ | ||
129 | - ${jprt.my.linux.i586.test.targets}, \ | ||
130 | + ${jprt.my.linux.x86.test.targets}, \ | ||
131 | ${jprt.my.linux.x64.test.targets}, \ | ||
132 | ${jprt.my.windows.i586.test.targets}, \ | ||
133 | ${jprt.my.windows.x64.test.targets} | ||
134 | diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh | ||
135 | index e317fdd..5d3b1ff 100644 | ||
136 | --- openjdk/hotspot/make/linux/build.sh | ||
137 | +++ openjdk/hotspot/make/linux/build.sh | ||
138 | @@ -43,7 +43,7 @@ esac | ||
139 | |||
140 | case `uname -m` in | ||
141 | i386|i486|i586|i686) | ||
142 | - mach=i386 | ||
143 | + mach=x86 | ||
144 | ;; | ||
145 | *) | ||
146 | echo "Unsupported machine: " `uname -m` | ||
147 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
148 | index add9823..cbbf81f 100644 | ||
149 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
150 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
151 | @@ -30,7 +30,7 @@ | ||
152 | # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the | ||
153 | # environment or on the command-line: | ||
154 | # | ||
155 | -# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory | ||
156 | +# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory | ||
157 | # BUILDARCH - build directory | ||
158 | # LIBARCH - the corresponding directory in JDK/JRE | ||
159 | # GAMMADIR - top of workspace | ||
160 | @@ -316,7 +316,7 @@ NO_JAVA_HOME_MSG = \ | ||
161 | DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | ||
162 | JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) | ||
163 | |||
164 | -DATA_MODE/i486 = 32 | ||
165 | +DATA_MODE/x86 = 32 | ||
166 | DATA_MODE/sparc = 32 | ||
167 | DATA_MODE/sparcv9 = 64 | ||
168 | DATA_MODE/amd64 = 64 | ||
169 | diff --git openjdk/hotspot/make/linux/makefiles/cscope.make openjdk/hotspot/make/linux/makefiles/cscope.make | ||
170 | index 113d4f8..d3f06cb 100644 | ||
171 | --- openjdk/hotspot/make/linux/makefiles/cscope.make | ||
172 | +++ openjdk/hotspot/make/linux/makefiles/cscope.make | ||
173 | @@ -78,7 +78,7 @@ endif | ||
174 | # Processor-specific files for other processors are excluded by default. Use | ||
175 | # CS_CPU=x to include platform-specific files for other platforms. | ||
176 | ifndef CS_CPU | ||
177 | -CS_CPU = i486 sparc amd64 ia64 | ||
178 | +CS_CPU = x86 sparc amd64 ia64 | ||
179 | CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU})) | ||
180 | endif | ||
181 | |||
182 | diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make | ||
183 | index 9131c79..138dfb3 100644 | ||
184 | --- openjdk/hotspot/make/linux/makefiles/defs.make | ||
185 | +++ openjdk/hotspot/make/linux/makefiles/defs.make | ||
186 | @@ -85,6 +85,14 @@ ifeq ($(ARCH), sparc) | ||
187 | HS_ARCH = sparc | ||
188 | endif | ||
189 | |||
190 | +# x86 | ||
191 | +ifeq ($(findstring 86,$(ARCH)), 86) | ||
192 | + ARCH_DATA_MODEL = 32 | ||
193 | + PLATFORM = linux-x86 | ||
194 | + VM_PLATFORM = linux_x86 | ||
195 | + HS_ARCH = x86 | ||
196 | +endif | ||
197 | + | ||
198 | # x86_64 | ||
199 | ifeq ($(ARCH), x86_64) | ||
200 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
201 | @@ -95,22 +103,12 @@ ifeq ($(ARCH), x86_64) | ||
202 | HS_ARCH = x86 | ||
203 | else | ||
204 | ARCH_DATA_MODEL = 32 | ||
205 | - PLATFORM = linux-i586 | ||
206 | - VM_PLATFORM = linux_i486 | ||
207 | + PLATFORM = linux-x86 | ||
208 | + VM_PLATFORM = linux_x86 | ||
209 | HS_ARCH = x86 | ||
210 | - # We have to reset ARCH to i686 since SRCARCH relies on it | ||
211 | - ARCH = i686 | ||
212 | endif | ||
213 | endif | ||
214 | |||
215 | -# i686 | ||
216 | -ifeq ($(ARCH), i686) | ||
217 | - ARCH_DATA_MODEL = 32 | ||
218 | - PLATFORM = linux-i586 | ||
219 | - VM_PLATFORM = linux_i486 | ||
220 | - HS_ARCH = x86 | ||
221 | -endif | ||
222 | - | ||
223 | JDK_INCLUDE_SUBDIR=linux | ||
224 | |||
225 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | ||
226 | diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
227 | index 0a9f75b..2e29bb9 100644 | ||
228 | --- openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
229 | +++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
230 | @@ -30,7 +30,7 @@ CC = cc | ||
231 | AS = $(CC) -c | ||
232 | |||
233 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
234 | -ARCHFLAG/i486 = -m32 | ||
235 | +ARCHFLAG/x86 = -m32 | ||
236 | ARCHFLAG/amd64 = -m64 | ||
237 | |||
238 | CFLAGS += $(ARCHFLAG) | ||
239 | diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 | ||
240 | deleted file mode 100644 | ||
241 | index 610ac91..0000000 | ||
242 | --- openjdk/hotspot/make/linux/platform_i486 | ||
243 | +++ /dev/null | ||
244 | @@ -1,15 +0,0 @@ | ||
245 | -os_family = linux | ||
246 | - | ||
247 | -arch = x86 | ||
248 | - | ||
249 | -arch_model = x86_32 | ||
250 | - | ||
251 | -os_arch = linux_x86 | ||
252 | - | ||
253 | -os_arch_model = linux_x86_32 | ||
254 | - | ||
255 | -lib_arch = i386 | ||
256 | - | ||
257 | -compiler = gcc | ||
258 | - | ||
259 | -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
260 | diff --git openjdk/hotspot/make/linux/platform_i486.suncc openjdk/hotspot/make/linux/platform_i486.suncc | ||
261 | index 325a3fe..717fc75 100644 | ||
262 | --- openjdk/hotspot/make/linux/platform_i486.suncc | ||
263 | +++ openjdk/hotspot/make/linux/platform_i486.suncc | ||
264 | @@ -8,10 +8,10 @@ os_arch = linux_x86 | ||
265 | |||
266 | os_arch_model = linux_x86_32 | ||
267 | |||
268 | -lib_arch = i386 | ||
269 | +lib_arch = x86 | ||
270 | |||
271 | compiler = sparcWorks | ||
272 | |||
273 | -gnu_dis_arch = i386 | ||
274 | +gnu_dis_arch = x86 | ||
275 | |||
276 | sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
277 | diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 | ||
278 | new file mode 100644 | ||
279 | index 0000000..5c613fe | ||
280 | --- /dev/null | ||
281 | +++ openjdk/hotspot/make/linux/platform_x86 | ||
282 | @@ -0,0 +1,15 @@ | ||
283 | +os_family = linux | ||
284 | + | ||
285 | +arch = x86 | ||
286 | + | ||
287 | +arch_model = x86_32 | ||
288 | + | ||
289 | +os_arch = linux_x86 | ||
290 | + | ||
291 | +os_arch_model = linux_x86_32 | ||
292 | + | ||
293 | +lib_arch = x86 | ||
294 | + | ||
295 | +compiler = gcc | ||
296 | + | ||
297 | +sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
298 | diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
299 | index b2b3162..a4bbe70 100644 | ||
300 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
301 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
302 | @@ -164,7 +164,7 @@ bool os::have_special_privileges() { | ||
303 | // i386: 224, ia64: 1105, amd64: 186, sparc 143 | ||
304 | #ifdef __ia64__ | ||
305 | #define SYS_gettid 1105 | ||
306 | -#elif __i386__ | ||
307 | +#elif __x86__ | ||
308 | #define SYS_gettid 224 | ||
309 | #elif __amd64__ | ||
310 | #define SYS_gettid 186 | ||
311 | @@ -181,7 +181,7 @@ static char cpu_arch[] = ZERO_LIBARCH; | ||
312 | #elif defined(IA64) | ||
313 | static char cpu_arch[] = "ia64"; | ||
314 | #elif defined(IA32) | ||
315 | -static char cpu_arch[] = "i386"; | ||
316 | +static char cpu_arch[] = "x86"; | ||
317 | #elif defined(AMD64) | ||
318 | static char cpu_arch[] = "amd64"; | ||
319 | #elif defined(SPARC) | ||
320 | diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
321 | index 6bdf4b8..fd43c6e 100644 | ||
322 | --- openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
323 | +++ openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
324 | @@ -32,7 +32,7 @@ BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) | ||
325 | endif | ||
326 | |||
327 | # Default arch; it is changed below as needed. | ||
328 | -ARCH = i386 | ||
329 | +ARCH = x86 | ||
330 | OS = $(shell uname) | ||
331 | |||
332 | CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd | ||
333 | @@ -87,7 +87,7 @@ endif # SunOS | ||
334 | LIBARCH = $(ARCH) | ||
335 | ifdef LP64 | ||
336 | LIBARCH64/sparc = sparcv9 | ||
337 | -LIBARCH64/i386 = amd64 | ||
338 | +LIBARCH64/x86 = amd64 | ||
339 | LIBARCH64 = $(LIBARCH64/$(ARCH)) | ||
340 | ifneq ($(LIBARCH64),) | ||
341 | LIBARCH = $(LIBARCH64) | ||
342 | diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
343 | index 75b7efe..62c692b 100644 | ||
344 | --- openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
345 | +++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
346 | @@ -383,8 +383,8 @@ static void print_help(struct hsdis_app_data* app_data, | ||
347 | else | ||
348 | disassembler_usage(stderr); /* better than nothing */ | ||
349 | (*printf_callback)(printf_stream, " mach=<arch> select disassembly mode\n"); | ||
350 | -#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) | ||
351 | - (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); | ||
352 | +#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) | ||
353 | + (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); | ||
354 | (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); | ||
355 | (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); | ||
356 | #endif | ||
357 | @@ -406,7 +406,7 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { | ||
358 | static const char* native_arch_name() { | ||
359 | const char* res = HOTSPOT_LIB_ARCH; | ||
360 | #ifdef LIBARCH_amd64 | ||
361 | - res = "i386:x86-64"; | ||
362 | + res = "x86:x86-64"; | ||
363 | #endif | ||
364 | #ifdef LIBARCH_sparc | ||
365 | res = "sparc:v8plusb"; | ||
366 | diff --git openjdk/hotspot/test/Makefile openjdk/hotspot/test/Makefile | ||
367 | index 2596d85..c2f3eb9 100644 | ||
368 | --- openjdk/hotspot/test/Makefile | ||
369 | +++ openjdk/hotspot/test/Makefile | ||
370 | @@ -33,14 +33,14 @@ ifeq ($(OSNAME), SunOS) | ||
371 | PLATFORM = solaris | ||
372 | ARCH = $(shell uname -p) | ||
373 | ifeq ($(ARCH), i386) | ||
374 | - ARCH=i586 | ||
375 | + ARCH=x86 | ||
376 | endif | ||
377 | endif | ||
378 | ifeq ($(OSNAME), Linux) | ||
379 | PLATFORM = linux | ||
380 | ARCH = $(shell uname -m) | ||
381 | - ifeq ($(ARCH), i386) | ||
382 | - ARCH = i586 | ||
383 | + ifeq ($(findstring 86,$(ARCH)), 86) | ||
384 | + ARCH = x86 | ||
385 | endif | ||
386 | endif | ||
387 | ifeq ($(OSNAME), Windows_NT) | ||
388 | @@ -55,7 +55,7 @@ ifeq ($(OSNAME), Windows_NT) | ||
389 | ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) | ||
390 | ARCH = x64 | ||
391 | else | ||
392 | - ARCH = i586 | ||
393 | + ARCH = x86 | ||
394 | endif | ||
395 | endif | ||
396 | endif | ||
397 | diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh | ||
398 | index 38e0f78..64c8410 100644 | ||
399 | --- openjdk/hotspot/agent/make/saenv.sh | ||
400 | +++ openjdk/hotspot/agent/make/saenv.sh | ||
401 | @@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then | ||
402 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
403 | CPU=amd64 | ||
404 | else | ||
405 | - SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 | ||
406 | + SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 | ||
407 | OPTIONS="-Dsa.library.path=$SA_LIBPATH" | ||
408 | - CPU=i386 | ||
409 | + CPU=x86 | ||
410 | fi | ||
411 | else | ||
412 | SA_LIBPATH=$STARTDIR/../src/os/solaris/proc/`uname -p`:$STARTDIR/solaris/`uname -p` | ||
413 | diff --git openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
414 | index c4ca7de..54c12ca 100644 | ||
415 | --- openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
416 | +++ openjdk/hotspot/agent/src/os/linux/LinuxDebuggerLocal.c | ||
417 | @@ -29,7 +29,7 @@ | ||
418 | #define amd64 1 | ||
419 | #endif | ||
420 | |||
421 | -#ifdef i386 | ||
422 | +#ifdef x86 | ||
423 | #include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h" | ||
424 | #endif | ||
425 | |||
426 | @@ -295,7 +295,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
427 | } | ||
428 | |||
429 | #undef NPRGREG | ||
430 | -#ifdef i386 | ||
431 | +#ifdef x86 | ||
432 | #define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG | ||
433 | #endif | ||
434 | #ifdef ia64 | ||
435 | @@ -314,7 +314,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
436 | |||
437 | #undef REG_INDEX | ||
438 | |||
439 | -#ifdef i386 | ||
440 | +#ifdef x86 | ||
441 | #define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg | ||
442 | |||
443 | regs[REG_INDEX(GS)] = (uintptr_t) gregs.xgs; | ||
444 | @@ -333,7 +333,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_linux_LinuxDebuggerLo | ||
445 | regs[REG_INDEX(CS)] = (uintptr_t) gregs.xcs; | ||
446 | regs[REG_INDEX(SS)] = (uintptr_t) gregs.xss; | ||
447 | |||
448 | -#endif /* i386 */ | ||
449 | +#endif /* x86 */ | ||
450 | |||
451 | #if ia64 | ||
452 | regs = (*env)->GetLongArrayElements(env, array, &isCopy); | ||
453 | diff --git openjdk/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile | ||
454 | index a16f3a7..85fecb1 100644 | ||
455 | --- openjdk/hotspot/agent/src/os/linux/Makefile | ||
456 | +++ openjdk/hotspot/agent/src/os/linux/Makefile | ||
457 | @@ -22,7 +22,7 @@ | ||
458 | # | ||
459 | # | ||
460 | |||
461 | -ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) | ||
462 | +ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo x86 ; fi ) | ||
463 | GCC = gcc$(GCC_SUFFIX) | ||
464 | |||
465 | JAVAH = ${JAVA_HOME}/bin/javah | ||
466 | diff --git openjdk/hotspot/agent/src/os/linux/ps_core.c openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
467 | index 3562f2d..47ab01b 100644 | ||
468 | --- openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
469 | +++ openjdk/hotspot/agent/src/os/linux/ps_core.c | ||
470 | @@ -540,7 +540,7 @@ static bool core_handle_prstatus(struct ps_prochandle* ph, const char* buf, size | ||
471 | |||
472 | if (is_debug()) { | ||
473 | print_debug("integer regset\n"); | ||
474 | -#ifdef i386 | ||
475 | +#ifdef x86 | ||
476 | // print the regset | ||
477 | print_debug("\teax = 0x%x\n", newthr->regs.eax); | ||
478 | print_debug("\tebx = 0x%x\n", newthr->regs.ebx); | ||
479 | diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make | ||
480 | index 83ddd1a..c20c7eb 100644 | ||
481 | --- openjdk/hotspot/make/defs.make | ||
482 | +++ openjdk/hotspot/make/defs.make | ||
483 | @@ -207,7 +207,7 @@ ifneq ($(OSNAME),windows) | ||
484 | ifdef LP64 | ||
485 | BUILDARCH = amd64 | ||
486 | else | ||
487 | - BUILDARCH = i486 | ||
488 | + BUILDARCH = x86 | ||
489 | endif | ||
490 | endif | ||
491 | ifeq ($(BUILDARCH), sparc) | ||
492 | @@ -218,7 +218,7 @@ ifneq ($(OSNAME),windows) | ||
493 | |||
494 | # LIBARCH is 1:1 mapping from BUILDARCH | ||
495 | LIBARCH = $(LIBARCH/$(BUILDARCH)) | ||
496 | - LIBARCH/i486 = i386 | ||
497 | + LIBARCH/x86 = x86 | ||
498 | LIBARCH/amd64 = amd64 | ||
499 | LIBARCH/sparc = sparc | ||
500 | LIBARCH/sparcv9 = sparcv9 | ||
501 | diff --git openjdk/hotspot/make/jprt.config openjdk/hotspot/make/jprt.config | ||
502 | index bc82543..4a1ef4e 100644 | ||
503 | --- openjdk/hotspot/make/jprt.config | ||
504 | +++ openjdk/hotspot/make/jprt.config | ||
505 | @@ -111,7 +111,7 @@ elif [ "${osname}" = Linux ] ; then | ||
506 | # LINUX: X86, AMD64 | ||
507 | osarch=`uname -m` | ||
508 | if [ "${osarch}" = i686 ] ; then | ||
509 | - linux_arch=i586 | ||
510 | + linux_arch=x86 | ||
511 | elif [ "${osarch}" = x86_64 ] ; then | ||
512 | linux_arch=amd64 | ||
513 | fi | ||
514 | diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties | ||
515 | index eb2ce82..7193de0 100644 | ||
516 | --- openjdk/hotspot/make/jprt.properties | ||
517 | +++ openjdk/hotspot/make/jprt.properties | ||
518 | @@ -70,7 +70,7 @@ jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10 | ||
519 | jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10 | ||
520 | jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} | ||
521 | |||
522 | -jprt.my.linux.i586=linux_i586 | ||
523 | +jprt.my.linux.x86=linux_x86 | ||
524 | jprt.my.linux.x64=linux_x64 | ||
525 | jprt.my.windows.i586=windows_i586 | ||
526 | jprt.my.windows.x64=windows_x64 | ||
527 | @@ -201,30 +201,30 @@ jprt.my.solaris.i586.test.targets= \ | ||
528 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_2, \ | ||
529 | ${jprt.my.solaris.i586}-{product|fastdebug}-{c1|c2}-scimark_3 | ||
530 | |||
531 | -jprt.my.linux.i586.test.targets = \ | ||
532 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
533 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
534 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ | ||
535 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_2, \ | ||
536 | - ${jprt.my.linux.i586}-product-c1-runThese_Xcomp_3, \ | ||
537 | - ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ | ||
538 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ | ||
539 | - ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp_2, \ | ||
540 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
541 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
542 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
543 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
544 | - ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
545 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ | ||
546 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ | ||
547 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
548 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
549 | - ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ | ||
550 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ | ||
551 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
552 | - ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ | ||
553 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_2, \ | ||
554 | - ${jprt.my.linux.i586}-{product|fastdebug}-c2-scimark_3 | ||
555 | +jprt.my.linux.x86.test.targets = \ | ||
556 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ | ||
557 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ | ||
558 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ | ||
559 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_2, \ | ||
560 | + ${jprt.my.linux.x86}-product-c1-runThese_Xcomp_3, \ | ||
561 | + ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ | ||
562 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ | ||
563 | + ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp_2, \ | ||
564 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ | ||
565 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ | ||
566 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ | ||
567 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ | ||
568 | + ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ | ||
569 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ | ||
570 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ | ||
571 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ | ||
572 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ | ||
573 | + ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ | ||
574 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ | ||
575 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ | ||
576 | + ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ | ||
577 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_2, \ | ||
578 | + ${jprt.my.linux.x86}-{product|fastdebug}-c2-scimark_3 | ||
579 | |||
580 | jprt.my.linux.x64.test.targets = \ | ||
581 | ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ | ||
582 | @@ -294,7 +294,7 @@ jprt.test.targets = \ | ||
583 | ${jprt.my.solaris.sparcv9.test.targets}, \ | ||
584 | ${jprt.my.solaris.i586.test.targets}, \ | ||
585 | ${jprt.my.solaris.x64.test.targets}, \ | ||
586 | - ${jprt.my.linux.i586.test.targets}, \ | ||
587 | + ${jprt.my.linux.x86.test.targets}, \ | ||
588 | ${jprt.my.linux.x64.test.targets}, \ | ||
589 | ${jprt.my.windows.i586.test.targets}, \ | ||
590 | ${jprt.my.windows.x64.test.targets} | ||
591 | diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh | ||
592 | index e317fdd..5d3b1ff 100644 | ||
593 | --- openjdk/hotspot/make/linux/build.sh | ||
594 | +++ openjdk/hotspot/make/linux/build.sh | ||
595 | @@ -43,7 +43,7 @@ esac | ||
596 | |||
597 | case `uname -m` in | ||
598 | i386|i486|i586|i686) | ||
599 | - mach=i386 | ||
600 | + mach=x86 | ||
601 | ;; | ||
602 | *) | ||
603 | echo "Unsupported machine: " `uname -m` | ||
604 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
605 | index add9823..cbbf81f 100644 | ||
606 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
607 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
608 | @@ -30,7 +30,7 @@ | ||
609 | # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the | ||
610 | # environment or on the command-line: | ||
611 | # | ||
612 | -# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory | ||
613 | +# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory | ||
614 | # BUILDARCH - build directory | ||
615 | # LIBARCH - the corresponding directory in JDK/JRE | ||
616 | # GAMMADIR - top of workspace | ||
617 | @@ -316,7 +316,7 @@ NO_JAVA_HOME_MSG = \ | ||
618 | DATA_MODE = $(DATA_MODE/$(BUILDARCH)) | ||
619 | JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) | ||
620 | |||
621 | -DATA_MODE/i486 = 32 | ||
622 | +DATA_MODE/x86 = 32 | ||
623 | DATA_MODE/sparc = 32 | ||
624 | DATA_MODE/sparcv9 = 64 | ||
625 | DATA_MODE/amd64 = 64 | ||
626 | diff --git openjdk/hotspot/make/linux/makefiles/cscope.make openjdk/hotspot/make/linux/makefiles/cscope.make | ||
627 | index 113d4f8..d3f06cb 100644 | ||
628 | --- openjdk/hotspot/make/linux/makefiles/cscope.make | ||
629 | +++ openjdk/hotspot/make/linux/makefiles/cscope.make | ||
630 | @@ -78,7 +78,7 @@ endif | ||
631 | # Processor-specific files for other processors are excluded by default. Use | ||
632 | # CS_CPU=x to include platform-specific files for other platforms. | ||
633 | ifndef CS_CPU | ||
634 | -CS_CPU = i486 sparc amd64 ia64 | ||
635 | +CS_CPU = x86 sparc amd64 ia64 | ||
636 | CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU})) | ||
637 | endif | ||
638 | |||
639 | diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make | ||
640 | index 9131c79..138dfb3 100644 | ||
641 | --- openjdk/hotspot/make/linux/makefiles/defs.make | ||
642 | +++ openjdk/hotspot/make/linux/makefiles/defs.make | ||
643 | @@ -85,6 +85,14 @@ ifeq ($(ARCH), sparc) | ||
644 | HS_ARCH = sparc | ||
645 | endif | ||
646 | |||
647 | +# x86 | ||
648 | +ifeq ($(findstring 86,$(ARCH)), 86) | ||
649 | + ARCH_DATA_MODEL = 32 | ||
650 | + PLATFORM = linux-x86 | ||
651 | + VM_PLATFORM = linux_x86 | ||
652 | + HS_ARCH = x86 | ||
653 | +endif | ||
654 | + | ||
655 | # x86_64 | ||
656 | ifeq ($(ARCH), x86_64) | ||
657 | ifeq ($(ARCH_DATA_MODEL), 64) | ||
658 | @@ -95,22 +103,12 @@ ifeq ($(ARCH), x86_64) | ||
659 | HS_ARCH = x86 | ||
660 | else | ||
661 | ARCH_DATA_MODEL = 32 | ||
662 | - PLATFORM = linux-i586 | ||
663 | - VM_PLATFORM = linux_i486 | ||
664 | + PLATFORM = linux-x86 | ||
665 | + VM_PLATFORM = linux_x86 | ||
666 | HS_ARCH = x86 | ||
667 | - # We have to reset ARCH to i686 since SRCARCH relies on it | ||
668 | - ARCH = i686 | ||
669 | endif | ||
670 | endif | ||
671 | |||
672 | -# i686 | ||
673 | -ifeq ($(ARCH), i686) | ||
674 | - ARCH_DATA_MODEL = 32 | ||
675 | - PLATFORM = linux-i586 | ||
676 | - VM_PLATFORM = linux_i486 | ||
677 | - HS_ARCH = x86 | ||
678 | -endif | ||
679 | - | ||
680 | JDK_INCLUDE_SUBDIR=linux | ||
681 | |||
682 | # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | ||
683 | diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make | ||
684 | index a2c24bc..27bad01 100644 | ||
685 | --- openjdk/hotspot/make/linux/makefiles/gcc.make | ||
686 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make | ||
687 | @@ -77,7 +77,7 @@ CFLAGS += -fcheck-new | ||
688 | CFLAGS += -g | ||
689 | |||
690 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
691 | -ARCHFLAG/i486 = -m32 -march=i586 | ||
692 | +ARCHFLAG/x86 = -m32 | ||
693 | ARCHFLAG/amd64 = -m64 | ||
694 | ARCHFLAG/ia64 = | ||
695 | ARCHFLAG/sparc = -m32 -mcpu=v9 | ||
696 | diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
697 | index 0a9f75b..2e29bb9 100644 | ||
698 | --- openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
699 | +++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make | ||
700 | @@ -30,7 +30,7 @@ CC = cc | ||
701 | AS = $(CC) -c | ||
702 | |||
703 | ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) | ||
704 | -ARCHFLAG/i486 = -m32 | ||
705 | +ARCHFLAG/x86 = -m32 | ||
706 | ARCHFLAG/amd64 = -m64 | ||
707 | |||
708 | CFLAGS += $(ARCHFLAG) | ||
709 | diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 | ||
710 | deleted file mode 100644 | ||
711 | index 610ac91..0000000 | ||
712 | --- openjdk/hotspot/make/linux/platform_i486 | ||
713 | +++ /dev/null | ||
714 | @@ -1,15 +0,0 @@ | ||
715 | -os_family = linux | ||
716 | - | ||
717 | -arch = x86 | ||
718 | - | ||
719 | -arch_model = x86_32 | ||
720 | - | ||
721 | -os_arch = linux_x86 | ||
722 | - | ||
723 | -os_arch_model = linux_x86_32 | ||
724 | - | ||
725 | -lib_arch = i386 | ||
726 | - | ||
727 | -compiler = gcc | ||
728 | - | ||
729 | -sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
730 | diff --git openjdk/hotspot/make/linux/platform_i486.suncc openjdk/hotspot/make/linux/platform_i486.suncc | ||
731 | deleted file mode 100644 | ||
732 | index 325a3fe..0000000 | ||
733 | --- openjdk/hotspot/make/linux/platform_i486.suncc | ||
734 | +++ /dev/null | ||
735 | @@ -1,17 +0,0 @@ | ||
736 | -os_family = linux | ||
737 | - | ||
738 | -arch = x86 | ||
739 | - | ||
740 | -arch_model = x86_32 | ||
741 | - | ||
742 | -os_arch = linux_x86 | ||
743 | - | ||
744 | -os_arch_model = linux_x86_32 | ||
745 | - | ||
746 | -lib_arch = i386 | ||
747 | - | ||
748 | -compiler = sparcWorks | ||
749 | - | ||
750 | -gnu_dis_arch = i386 | ||
751 | - | ||
752 | -sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
753 | diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 | ||
754 | new file mode 100644 | ||
755 | index 0000000..5c613fe | ||
756 | --- /dev/null | ||
757 | +++ openjdk/hotspot/make/linux/platform_x86 | ||
758 | @@ -0,0 +1,15 @@ | ||
759 | +os_family = linux | ||
760 | + | ||
761 | +arch = x86 | ||
762 | + | ||
763 | +arch_model = x86_32 | ||
764 | + | ||
765 | +os_arch = linux_x86 | ||
766 | + | ||
767 | +os_arch_model = linux_x86_32 | ||
768 | + | ||
769 | +lib_arch = x86 | ||
770 | + | ||
771 | +compiler = gcc | ||
772 | + | ||
773 | +sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 | ||
774 | diff --git openjdk/hotspot/make/linux/platform_x86.suncc openjdk/hotspot/make/linux/platform_x86.suncc | ||
775 | new file mode 100644 | ||
776 | index 0000000..717fc75 | ||
777 | --- /dev/null | ||
778 | +++ openjdk/hotspot/make/linux/platform_x86.suncc | ||
779 | @@ -0,0 +1,17 @@ | ||
780 | +os_family = linux | ||
781 | + | ||
782 | +arch = x86 | ||
783 | + | ||
784 | +arch_model = x86_32 | ||
785 | + | ||
786 | +os_arch = linux_x86 | ||
787 | + | ||
788 | +os_arch_model = linux_x86_32 | ||
789 | + | ||
790 | +lib_arch = x86 | ||
791 | + | ||
792 | +compiler = sparcWorks | ||
793 | + | ||
794 | +gnu_dis_arch = x86 | ||
795 | + | ||
796 | +sysdefs = -DLINUX -DSPARC_WORKS -D_GNU_SOURCE -DIA32 | ||
797 | diff --git openjdk/hotspot/src/os/linux/launcher/java_md.c openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
798 | index 50a86cd..48141be 100644 | ||
799 | --- openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
800 | +++ openjdk/hotspot/src/os/linux/launcher/java_md.c | ||
801 | @@ -56,8 +56,8 @@ | ||
802 | * models is supported, then DUAL_MODE is defined. When DUAL_MODE is | ||
803 | * defined, the architecture names for the narrow and wide version of | ||
804 | * the architecture are defined in BIG_ARCH and SMALL_ARCH. Currently | ||
805 | - * only Solaris on sparc/sparcv9 and i586/amd64 is DUAL_MODE; linux | ||
806 | - * i586/amd64 could be defined as DUAL_MODE but that is not the | ||
807 | + * only Solaris on sparc/sparcv9 and x86/amd64 is DUAL_MODE; linux | ||
808 | + * x86/amd64 could be defined as DUAL_MODE but that is not the | ||
809 | * current policy. | ||
810 | */ | ||
811 | |||
812 | @@ -75,8 +75,8 @@ | ||
813 | |||
814 | #else /* 32-bit data model */ | ||
815 | |||
816 | -# ifdef i586 | ||
817 | -# define ARCH "i386" | ||
818 | +# ifdef x86 | ||
819 | +# define ARCH "x86" | ||
820 | # elif defined(__sparc) | ||
821 | # define ARCH "sparc" | ||
822 | # endif | ||
823 | @@ -90,7 +90,7 @@ | ||
824 | # define SMALL_ARCH "sparc" | ||
825 | # else | ||
826 | # define BIG_ARCH "amd64" | ||
827 | -# define SMALL_ARCH "i386" | ||
828 | +# define SMALL_ARCH "x86" | ||
829 | # endif | ||
830 | # include <sys/systeminfo.h> | ||
831 | # include <sys/elf.h> | ||
832 | @@ -1103,7 +1103,7 @@ void PrintMachineDependentOptions() { | ||
833 | * This code is somewhat more confused with #ifdef's than we'd | ||
834 | * like because this file is used by both Solaris and Linux | ||
835 | * platforms, and so needs to be parameterized for SPARC and | ||
836 | - * i586 hardware. The other Linux platforms (amd64 and ia64) | ||
837 | + * x86 hardware. The other Linux platforms (amd64 and ia64) | ||
838 | * don't even ask this question, because they only come with | ||
839 | * server JVMs. */ | ||
840 | |||
841 | @@ -1168,11 +1168,11 @@ solaris_sparc_ServerClassMachine(void) { | ||
842 | |||
843 | #endif /* __sun && __sparc */ | ||
844 | |||
845 | -#if defined(__sun) && defined(i586) | ||
846 | +#if defined(__sun) && defined(x86) | ||
847 | |||
848 | /* | ||
849 | * A utility method for asking the CPU about itself. | ||
850 | - * There's a corresponding version of linux-i586 | ||
851 | + * There's a corresponding version of linux-x86 | ||
852 | * because the compilers are different. | ||
853 | */ | ||
854 | void | ||
855 | @@ -1218,13 +1218,13 @@ get_cpuid(uint32_t arg, | ||
856 | #endif | ||
857 | } | ||
858 | |||
859 | -#endif /* __sun && i586 */ | ||
860 | +#endif /* __sun && x86 */ | ||
861 | |||
862 | -#if defined(__linux__) && defined(i586) | ||
863 | +#if defined(__linux__) && defined(x86) | ||
864 | |||
865 | /* | ||
866 | * A utility method for asking the CPU about itself. | ||
867 | - * There's a corresponding version of solaris-i586 | ||
868 | + * There's a corresponding version of solaris-x86 | ||
869 | * because the compilers are different. | ||
870 | */ | ||
871 | void | ||
872 | @@ -1286,11 +1286,11 @@ get_cpuid(uint32_t arg, | ||
873 | #endif | ||
874 | } | ||
875 | |||
876 | -#endif /* __linux__ && i586 */ | ||
877 | +#endif /* __linux__ && x86 */ | ||
878 | |||
879 | -#ifdef i586 | ||
880 | +#ifdef x86 | ||
881 | /* | ||
882 | - * Routines shared by solaris-i586 and linux-i586. | ||
883 | + * Routines shared by solaris-x86 and linux-x86. | ||
884 | */ | ||
885 | |||
886 | enum HyperThreadingSupport_enum { | ||
887 | @@ -1430,11 +1430,11 @@ physical_processors(void) { | ||
888 | return result; | ||
889 | } | ||
890 | |||
891 | -#endif /* i586 */ | ||
892 | +#endif /* x86 */ | ||
893 | |||
894 | -#if defined(__sun) && defined(i586) | ||
895 | +#if defined(__sun) && defined(x86) | ||
896 | |||
897 | -/* The definition of a server-class machine for solaris-i586/amd64 */ | ||
898 | +/* The definition of a server-class machine for solaris-x86/amd64 */ | ||
899 | jboolean | ||
900 | solaris_i586_ServerClassMachine(void) { | ||
901 | jboolean result = JNI_FALSE; | ||
902 | @@ -1463,11 +1463,11 @@ solaris_i586_ServerClassMachine(void) { | ||
903 | return result; | ||
904 | } | ||
905 | |||
906 | -#endif /* __sun && i586 */ | ||
907 | +#endif /* __sun && x86 */ | ||
908 | |||
909 | -#if defined(__linux__) && defined(i586) | ||
910 | +#if defined(__linux__) && defined(x86) | ||
911 | |||
912 | -/* The definition of a server-class machine for linux-i586 */ | ||
913 | +/* The definition of a server-class machine for linux-x86 */ | ||
914 | jboolean | ||
915 | linux_i586_ServerClassMachine(void) { | ||
916 | jboolean result = JNI_FALSE; | ||
917 | @@ -1496,7 +1496,7 @@ linux_i586_ServerClassMachine(void) { | ||
918 | return result; | ||
919 | } | ||
920 | |||
921 | -#endif /* __linux__ && i586 */ | ||
922 | +#endif /* __linux__ && x86 */ | ||
923 | |||
924 | /* Dispatch to the platform-specific definition of "server-class" */ | ||
925 | jboolean | ||
926 | @@ -1504,9 +1504,9 @@ ServerClassMachine(void) { | ||
927 | jboolean result = JNI_FALSE; | ||
928 | #if defined(__sun) && defined(__sparc) | ||
929 | result = solaris_sparc_ServerClassMachine(); | ||
930 | -#elif defined(__sun) && defined(i586) | ||
931 | +#elif defined(__sun) && defined(x86) | ||
932 | result = solaris_i586_ServerClassMachine(); | ||
933 | -#elif defined(__linux__) && defined(i586) | ||
934 | +#elif defined(__linux__) && defined(x86) | ||
935 | result = linux_i586_ServerClassMachine(); | ||
936 | #else | ||
937 | if (_launcher_debug) { | ||
938 | diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
939 | index b2b3162..a4bbe70 100644 | ||
940 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
941 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
942 | @@ -164,7 +164,7 @@ bool os::have_special_privileges() { | ||
943 | // i386: 224, ia64: 1105, amd64: 186, sparc 143 | ||
944 | #ifdef __ia64__ | ||
945 | #define SYS_gettid 1105 | ||
946 | -#elif __i386__ | ||
947 | +#elif __x86__ | ||
948 | #define SYS_gettid 224 | ||
949 | #elif __amd64__ | ||
950 | #define SYS_gettid 186 | ||
951 | @@ -181,7 +181,7 @@ static char cpu_arch[] = ZERO_LIBARCH; | ||
952 | #elif defined(IA64) | ||
953 | static char cpu_arch[] = "ia64"; | ||
954 | #elif defined(IA32) | ||
955 | -static char cpu_arch[] = "i386"; | ||
956 | +static char cpu_arch[] = "x86"; | ||
957 | #elif defined(AMD64) | ||
958 | static char cpu_arch[] = "amd64"; | ||
959 | #elif defined(SPARC) | ||
960 | diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
961 | index 6bdf4b8..fd43c6e 100644 | ||
962 | --- openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
963 | +++ openjdk/hotspot/src/share/tools/hsdis/Makefile | ||
964 | @@ -32,7 +32,7 @@ BINUTILS = $(shell cd ../../../../..;pwd)/binutils-2.17-$(LIBARCH) | ||
965 | endif | ||
966 | |||
967 | # Default arch; it is changed below as needed. | ||
968 | -ARCH = i386 | ||
969 | +ARCH = x86 | ||
970 | OS = $(shell uname) | ||
971 | |||
972 | CPPFLAGS += -I$(BINUTILS)/include -I$(BINUTILS)/bfd | ||
973 | @@ -87,7 +87,7 @@ endif # SunOS | ||
974 | LIBARCH = $(ARCH) | ||
975 | ifdef LP64 | ||
976 | LIBARCH64/sparc = sparcv9 | ||
977 | -LIBARCH64/i386 = amd64 | ||
978 | +LIBARCH64/x86 = amd64 | ||
979 | LIBARCH64 = $(LIBARCH64/$(ARCH)) | ||
980 | ifneq ($(LIBARCH64),) | ||
981 | LIBARCH = $(LIBARCH64) | ||
982 | diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
983 | index 75b7efe..62c692b 100644 | ||
984 | --- openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
985 | +++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c | ||
986 | @@ -383,8 +383,8 @@ static void print_help(struct hsdis_app_data* app_data, | ||
987 | else | ||
988 | disassembler_usage(stderr); /* better than nothing */ | ||
989 | (*printf_callback)(printf_stream, " mach=<arch> select disassembly mode\n"); | ||
990 | -#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) | ||
991 | - (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); | ||
992 | +#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) | ||
993 | + (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); | ||
994 | (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); | ||
995 | (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); | ||
996 | #endif | ||
997 | @@ -406,7 +406,7 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { | ||
998 | static const char* native_arch_name() { | ||
999 | const char* res = HOTSPOT_LIB_ARCH; | ||
1000 | #ifdef LIBARCH_amd64 | ||
1001 | - res = "i386:x86-64"; | ||
1002 | + res = "x86:x86-64"; | ||
1003 | #endif | ||
1004 | #ifdef LIBARCH_sparc | ||
1005 | res = "sparc:v8plusb"; | ||
1006 | diff --git openjdk/hotspot/src/share/vm/adlc/Test/i486.ad openjdk/hotspot/src/share/vm/adlc/Test/i486.ad | ||
1007 | deleted file mode 100644 | ||
1008 | index e69de29..0000000 | ||
1009 | diff --git openjdk/hotspot/src/share/vm/adlc/Test/x86.ad openjdk/hotspot/src/share/vm/adlc/Test/x86.ad | ||
1010 | new file mode 100644 | ||
1011 | index 0000000..e69de29 | ||
1012 | diff --git openjdk/hotspot/test/Makefile openjdk/hotspot/test/Makefile | ||
1013 | index 2596d85..c2f3eb9 100644 | ||
1014 | --- openjdk/hotspot/test/Makefile | ||
1015 | +++ openjdk/hotspot/test/Makefile | ||
1016 | @@ -33,14 +33,14 @@ ifeq ($(OSNAME), SunOS) | ||
1017 | PLATFORM = solaris | ||
1018 | ARCH = $(shell uname -p) | ||
1019 | ifeq ($(ARCH), i386) | ||
1020 | - ARCH=i586 | ||
1021 | + ARCH=x86 | ||
1022 | endif | ||
1023 | endif | ||
1024 | ifeq ($(OSNAME), Linux) | ||
1025 | PLATFORM = linux | ||
1026 | ARCH = $(shell uname -m) | ||
1027 | - ifeq ($(ARCH), i386) | ||
1028 | - ARCH = i586 | ||
1029 | + ifeq ($(findstring 86,$(ARCH)), 86) | ||
1030 | + ARCH = x86 | ||
1031 | endif | ||
1032 | endif | ||
1033 | ifeq ($(OSNAME), Windows_NT) | ||
1034 | @@ -55,7 +55,7 @@ ifeq ($(OSNAME), Windows_NT) | ||
1035 | ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),EM64T) | ||
1036 | ARCH = x64 | ||
1037 | else | ||
1038 | - ARCH = i586 | ||
1039 | + ARCH = x86 | ||
1040 | endif | ||
1041 | endif | ||
1042 | endif | ||
1043 | -- | ||
1044 | 1.6.5 | ||
1045 | |||
1046 | diff --git openjdk/hotspot/make/linux/makefiles/i486.make b/hotspot/make/linux/makefiles/i486.make | ||
1047 | deleted file mode 100644 | ||
1048 | index 9dd0b44..0000000 | ||
1049 | --- openjdk/hotspot/make/linux/makefiles/i486.make | ||
1050 | +++ /dev/null | ||
1051 | @@ -1,36 +0,0 @@ | ||
1052 | -# | ||
1053 | -# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. | ||
1054 | -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
1055 | -# | ||
1056 | -# This code is free software; you can redistribute it and/or modify it | ||
1057 | -# under the terms of the GNU General Public License version 2 only, as | ||
1058 | -# published by the Free Software Foundation. | ||
1059 | -# | ||
1060 | -# This code is distributed in the hope that it will be useful, but WITHOUT | ||
1061 | -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
1062 | -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
1063 | -# version 2 for more details (a copy is included in the LICENSE file that | ||
1064 | -# accompanied this code). | ||
1065 | -# | ||
1066 | -# You should have received a copy of the GNU General Public License version | ||
1067 | -# 2 along with this work; if not, write to the Free Software Foundation, | ||
1068 | -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
1069 | -# | ||
1070 | -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
1071 | -# CA 95054 USA or visit www.sun.com if you need additional information or | ||
1072 | -# have any questions. | ||
1073 | -# | ||
1074 | -# | ||
1075 | - | ||
1076 | -# TLS helper, assembled from .s file | ||
1077 | -# Not included in includeDB because it has no dependencies | ||
1078 | -Obj_Files += linux_x86_32.o | ||
1079 | - | ||
1080 | -# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized | ||
1081 | -OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) | ||
1082 | -# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized | ||
1083 | -OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) | ||
1084 | -# Must also specify if CPU is little endian | ||
1085 | -CFLAGS += -DVM_LITTLE_ENDIAN | ||
1086 | - | ||
1087 | -OPT_CFLAGS/compactingPermGenGen.o = -O1 | ||
1088 | diff --git openjdk/hotspot/make/linux/makefiles/x86.make openjdk/hotspot/make/linux/makefiles/x86.make | ||
1089 | new file mode 100644 | ||
1090 | index 0000000..9dd0b44 | ||
1091 | --- /dev/null | ||
1092 | +++ openjdk/hotspot/make/linux/makefiles/x86.make | ||
1093 | @@ -0,0 +1,36 @@ | ||
1094 | +# | ||
1095 | +# Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. | ||
1096 | +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
1097 | +# | ||
1098 | +# This code is free software; you can redistribute it and/or modify it | ||
1099 | +# under the terms of the GNU General Public License version 2 only, as | ||
1100 | +# published by the Free Software Foundation. | ||
1101 | +# | ||
1102 | +# This code is distributed in the hope that it will be useful, but WITHOUT | ||
1103 | +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
1104 | +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
1105 | +# version 2 for more details (a copy is included in the LICENSE file that | ||
1106 | +# accompanied this code). | ||
1107 | +# | ||
1108 | +# You should have received a copy of the GNU General Public License version | ||
1109 | +# 2 along with this work; if not, write to the Free Software Foundation, | ||
1110 | +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
1111 | +# | ||
1112 | +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
1113 | +# CA 95054 USA or visit www.sun.com if you need additional information or | ||
1114 | +# have any questions. | ||
1115 | +# | ||
1116 | +# | ||
1117 | + | ||
1118 | +# TLS helper, assembled from .s file | ||
1119 | +# Not included in includeDB because it has no dependencies | ||
1120 | +Obj_Files += linux_x86_32.o | ||
1121 | + | ||
1122 | +# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized | ||
1123 | +OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) | ||
1124 | +# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized | ||
1125 | +OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) | ||
1126 | +# Must also specify if CPU is little endian | ||
1127 | +CFLAGS += -DVM_LITTLE_ENDIAN | ||
1128 | + | ||
1129 | +OPT_CFLAGS/compactingPermGenGen.o = -O1 | ||
1130 | |||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-avoid-cdef-collision.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-avoid-cdef-collision.patch deleted file mode 100644 index 023ce4d..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-avoid-cdef-collision.patch +++ /dev/null | |||
@@ -1,203 +0,0 @@ | |||
1 | Fixes collisions with standard namespace | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | Upstream-Status: Backport | ||
5 | |||
6 | Index: openjdk/hotspot/src/share/vm/opto/addnode.cpp | ||
7 | =================================================================== | ||
8 | --- openjdk/hotspot/src/share/vm/opto/addnode.cpp 2010-02-16 19:11:09.000000000 -0800 | ||
9 | +++ openjdk/hotspot/src/share/vm/opto/addnode.cpp 2012-07-30 15:54:25.999551792 -0700 | ||
10 | @@ -27,8 +27,6 @@ | ||
11 | #include "incls/_precompiled.incl" | ||
12 | #include "incls/_addnode.cpp.incl" | ||
13 | |||
14 | -#define MAXFLOAT ((float)3.40282346638528860e+38) | ||
15 | - | ||
16 | // Classic Add functionality. This covers all the usual 'add' behaviors for | ||
17 | // an algebraic ring. Add-integer, add-float, add-double, and binary-or are | ||
18 | // all inherited from this class. The various identity values are supplied | ||
19 | Index: openjdk/hotspot/src/share/vm/prims/jniCheck.cpp | ||
20 | =================================================================== | ||
21 | --- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp 2010-02-16 19:11:10.000000000 -0800 | ||
22 | +++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp 2012-07-30 16:05:20.779549364 -0700 | ||
23 | @@ -80,7 +80,7 @@ | ||
24 | if (env != xenv) { \ | ||
25 | NativeReportJNIFatalError(thr, warn_wrong_jnienv); \ | ||
26 | } \ | ||
27 | - __ENTRY(result_type, header, thr) | ||
28 | + VM_ENTRY_BASE(result_type, header, thr) | ||
29 | |||
30 | |||
31 | #define UNCHECKED() (unchecked_jni_NativeInterface) | ||
32 | Index: openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl | ||
33 | =================================================================== | ||
34 | --- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl 2010-02-16 19:11:10.000000000 -0800 | ||
35 | +++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl 2012-07-30 16:03:50.491550815 -0700 | ||
36 | @@ -424,7 +424,7 @@ | ||
37 | <xsl:value-of select="$space"/> | ||
38 | <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text> | ||
39 | <xsl:value-of select="$space"/> | ||
40 | - <xsl:text>__ENTRY(jvmtiError, </xsl:text> | ||
41 | + <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text> | ||
42 | <xsl:apply-templates select="." mode="functionid"/> | ||
43 | <xsl:text> , current_thread)</xsl:text> | ||
44 | <xsl:value-of select="$space"/> | ||
45 | Index: openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp | ||
46 | =================================================================== | ||
47 | --- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2010-02-16 19:11:10.000000000 -0800 | ||
48 | +++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2012-07-30 16:04:03.683550594 -0700 | ||
49 | @@ -126,7 +126,7 @@ | ||
50 | // from native so as to resolve the jthread. | ||
51 | |||
52 | ThreadInVMfromNative __tiv(current_thread); | ||
53 | - __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) | ||
54 | + VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) | ||
55 | debug_only(VMNativeEntryWrapper __vew;) | ||
56 | |||
57 | oop thread_oop = JNIHandles::resolve_external_guard(thread); | ||
58 | Index: openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp | ||
59 | =================================================================== | ||
60 | --- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp 2010-02-16 19:11:10.000000000 -0800 | ||
61 | +++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp 2012-07-30 15:59:43.175550785 -0700 | ||
62 | @@ -345,7 +345,7 @@ | ||
63 | JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); | ||
64 | // transition code: native to VM | ||
65 | ThreadInVMfromNative __tiv(current_thread); | ||
66 | - __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) | ||
67 | + VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) | ||
68 | debug_only(VMNativeEntryWrapper __vew;) | ||
69 | |||
70 | JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); | ||
71 | Index: openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp | ||
72 | =================================================================== | ||
73 | --- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2010-02-16 19:11:10.000000000 -0800 | ||
74 | +++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2012-07-30 16:36:53.391544578 -0700 | ||
75 | @@ -46,7 +46,7 @@ | ||
76 | } | ||
77 | }; | ||
78 | |||
79 | -// InterfaceSupport provides functionality used by the __LEAF and __ENTRY | ||
80 | +// InterfaceSupport provides functionality used by the VM_LEAF_BASE and VM_ENTRY_BASE | ||
81 | // macros. These macros are used to guard entry points into the VM and | ||
82 | // perform checks upon leave of the VM. | ||
83 | |||
84 | @@ -391,7 +391,7 @@ | ||
85 | |||
86 | // LEAF routines do not lock, GC or throw exceptions | ||
87 | |||
88 | -#define __LEAF(result_type, header) \ | ||
89 | +#define VM_LEAF_BASE(result_type, header) \ | ||
90 | TRACE_CALL(result_type, header) \ | ||
91 | debug_only(NoHandleMark __hm;) \ | ||
92 | /* begin of body */ | ||
93 | @@ -399,7 +399,7 @@ | ||
94 | |||
95 | // ENTRY routines may lock, GC and throw exceptions | ||
96 | |||
97 | -#define __ENTRY(result_type, header, thread) \ | ||
98 | +#define VM_ENTRY_BASE(result_type, header, thread) \ | ||
99 | TRACE_CALL(result_type, header) \ | ||
100 | HandleMarkCleaner __hm(thread); \ | ||
101 | Thread* THREAD = thread; \ | ||
102 | @@ -421,20 +421,20 @@ | ||
103 | #define IRT_ENTRY(result_type, header) \ | ||
104 | result_type header { \ | ||
105 | ThreadInVMfromJava __tiv(thread); \ | ||
106 | - __ENTRY(result_type, header, thread) \ | ||
107 | + VM_ENTRY_BASE(result_type, header, thread) \ | ||
108 | debug_only(VMEntryWrapper __vew;) | ||
109 | |||
110 | |||
111 | #define IRT_LEAF(result_type, header) \ | ||
112 | result_type header { \ | ||
113 | - __LEAF(result_type, header) \ | ||
114 | + VM_LEAF_BASE(result_type, header) \ | ||
115 | debug_only(No_Safepoint_Verifier __nspv(true);) | ||
116 | |||
117 | |||
118 | #define IRT_ENTRY_NO_ASYNC(result_type, header) \ | ||
119 | result_type header { \ | ||
120 | ThreadInVMfromJavaNoAsyncException __tiv(thread); \ | ||
121 | - __ENTRY(result_type, header, thread) \ | ||
122 | + VM_ENTRY_BASE(result_type, header, thread) \ | ||
123 | debug_only(VMEntryWrapper __vew;) | ||
124 | |||
125 | // Another special case for nmethod_entry_point so the nmethod that the | ||
126 | @@ -445,7 +445,7 @@ | ||
127 | result_type header { \ | ||
128 | nmethodLocker _nmlock(nm); \ | ||
129 | ThreadInVMfromJavaNoAsyncException __tiv(thread); \ | ||
130 | - __ENTRY(result_type, header, thread) | ||
131 | + VM_ENTRY_BASE(result_type, header, thread) | ||
132 | |||
133 | #define IRT_END } | ||
134 | |||
135 | @@ -455,20 +455,20 @@ | ||
136 | #define JRT_ENTRY(result_type, header) \ | ||
137 | result_type header { \ | ||
138 | ThreadInVMfromJava __tiv(thread); \ | ||
139 | - __ENTRY(result_type, header, thread) \ | ||
140 | + VM_ENTRY_BASE(result_type, header, thread) \ | ||
141 | debug_only(VMEntryWrapper __vew;) | ||
142 | |||
143 | |||
144 | #define JRT_LEAF(result_type, header) \ | ||
145 | result_type header { \ | ||
146 | - __LEAF(result_type, header) \ | ||
147 | + VM_LEAF_BASE(result_type, header) \ | ||
148 | debug_only(JRT_Leaf_Verifier __jlv;) | ||
149 | |||
150 | |||
151 | #define JRT_ENTRY_NO_ASYNC(result_type, header) \ | ||
152 | result_type header { \ | ||
153 | ThreadInVMfromJavaNoAsyncException __tiv(thread); \ | ||
154 | - __ENTRY(result_type, header, thread) \ | ||
155 | + VM_ENTRY_BASE(result_type, header, thread) \ | ||
156 | debug_only(VMEntryWrapper __vew;) | ||
157 | |||
158 | // Same as JRT Entry but allows for return value after the safepoint | ||
159 | @@ -501,7 +501,7 @@ | ||
160 | assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ | ||
161 | ThreadInVMfromNative __tiv(thread); \ | ||
162 | debug_only(VMNativeEntryWrapper __vew;) \ | ||
163 | - __ENTRY(result_type, header, thread) | ||
164 | + VM_ENTRY_BASE(result_type, header, thread) | ||
165 | |||
166 | |||
167 | // Ensure that the VMNativeEntryWrapper constructor, which can cause | ||
168 | @@ -521,7 +521,7 @@ | ||
169 | result_type JNICALL header { \ | ||
170 | JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ | ||
171 | assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ | ||
172 | - __LEAF(result_type, header) | ||
173 | + VM_LEAF_BASE(result_type, header) | ||
174 | |||
175 | |||
176 | // Close the routine and the extern "C" | ||
177 | @@ -537,7 +537,7 @@ | ||
178 | JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ | ||
179 | ThreadInVMfromNative __tiv(thread); \ | ||
180 | debug_only(VMNativeEntryWrapper __vew;) \ | ||
181 | - __ENTRY(result_type, header, thread) | ||
182 | + VM_ENTRY_BASE(result_type, header, thread) | ||
183 | |||
184 | |||
185 | #define JVM_ENTRY_NO_ENV(result_type, header) \ | ||
186 | @@ -546,7 +546,7 @@ | ||
187 | JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \ | ||
188 | ThreadInVMfromNative __tiv(thread); \ | ||
189 | debug_only(VMNativeEntryWrapper __vew;) \ | ||
190 | - __ENTRY(result_type, header, thread) | ||
191 | + VM_ENTRY_BASE(result_type, header, thread) | ||
192 | |||
193 | |||
194 | #define JVM_QUICK_ENTRY(result_type, header) \ | ||
195 | @@ -562,7 +562,7 @@ | ||
196 | extern "C" { \ | ||
197 | result_type JNICALL header { \ | ||
198 | VM_Exit::block_if_vm_exited(); \ | ||
199 | - __LEAF(result_type, header) | ||
200 | + VM_LEAF_BASE(result_type, header) | ||
201 | |||
202 | |||
203 | #define JVM_END } } | ||
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 | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-native-vsyscall.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-native-vsyscall.patch deleted file mode 100644 index 936b211..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-native-vsyscall.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | Fixes the following compile time error when compiling icedtea6-native-1.8.11-r5.3 on a Fedora 20, x86_64: | ||
2 | os_linux.cpp: In function 'int sched_getcpu_syscall()': | ||
3 | os_linux.cpp:2431:60: error: expression cannot be used as a function | ||
4 | vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); | ||
5 | |||
6 | Fix taken from: | ||
7 | http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/9447b2fb6fcf | ||
8 | |||
9 | Signed-off-by: Max Krummenacher <max.oss.09@gmail.com> | ||
10 | |||
11 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2014-10-15 14:57:39.681794315 +0200 | ||
12 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-10-15 15:41:32.398109645 +0200 | ||
13 | @@ -54,10 +54,6 @@ | ||
14 | # include <sys/shm.h> | ||
15 | # include <link.h> | ||
16 | |||
17 | -#if __x86_64__ | ||
18 | -#include <asm/vsyscall.h> | ||
19 | -#endif | ||
20 | - | ||
21 | #define MAX_PATH (2 * K) | ||
22 | |||
23 | // for timer info max values which include all bits | ||
24 | @@ -2427,10 +2423,19 @@ | ||
25 | int retval = -1; | ||
26 | |||
27 | #if __x86_64__ | ||
28 | +// Unfortunately we have to bring all these macros here from vsyscall.h | ||
29 | +// to be able to compile on old linuxes. | ||
30 | +# define __NR_vgetcpu 2 | ||
31 | +# define VSYSCALL_START (-10UL << 20) | ||
32 | +# define VSYSCALL_SIZE 1024 | ||
33 | +# define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr)) | ||
34 | typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); | ||
35 | vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); | ||
36 | retval = vgetcpu(&cpu, NULL, NULL); | ||
37 | #elif __i386__ | ||
38 | +# ifndef SYS_getcpu | ||
39 | +# define SYS_getcpu 318 | ||
40 | +# endif | ||
41 | retval = syscall(SYS_getcpu, &cpu, NULL, NULL); | ||
42 | #endif | ||
43 | |||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-openjdk-remove-currency-data-generation-expi.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-openjdk-remove-currency-data-generation-expi.patch deleted file mode 100644 index eabee67..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-openjdk-remove-currency-data-generation-expi.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 5f5ed54f7f1ed82583f0f42abfa2625a93e96dd9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Gonzalez <alex.gonzalez@digi.com> | ||
3 | Date: Wed, 31 Dec 2014 15:04:10 +0100 | ||
4 | Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration | ||
5 | date. | ||
6 | |||
7 | Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com> | ||
8 | --- | ||
9 | .../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 --- | ||
10 | 1 file changed, 3 deletions(-) | ||
11 | |||
12 | diff --git a/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java b/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | ||
13 | index 29201c25909a..f66f523de5bd 100644 | ||
14 | --- a/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | ||
15 | +++ b/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | ||
16 | @@ -281,9 +281,6 @@ public class GenerateCurrencyData { | ||
17 | checkCurrencyCode(newCurrency); | ||
18 | String timeString = currencyInfo.substring(4, length - 4); | ||
19 | long time = format.parse(timeString).getTime(); | ||
20 | - if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { | ||
21 | - throw new RuntimeException("time is more than 10 years from present: " + time); | ||
22 | - } | ||
23 | specialCaseCutOverTimes[specialCaseCount] = time; | ||
24 | specialCaseOldCurrencies[specialCaseCount] = oldCurrency; | ||
25 | specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency); | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-sane-x86-arch-name.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-sane-x86-arch-name.patch deleted file mode 100644 index b4c6857..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-sane-x86-arch-name.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Index: icedtea6-1.8/acinclude.m4 | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/acinclude.m4 2010-04-10 21:58:40.000000000 +0200 | ||
4 | +++ icedtea6-1.8/acinclude.m4 2010-04-22 10:09:42.752587915 +0200 | ||
5 | @@ -9,11 +9,11 @@ | ||
6 | ARCHFLAG="-m64" | ||
7 | ;; | ||
8 | i?86) | ||
9 | - BUILD_ARCH_DIR=i586 | ||
10 | - INSTALL_ARCH_DIR=i386 | ||
11 | - JRE_ARCH_DIR=i386 | ||
12 | + BUILD_ARCH_DIR=x86 | ||
13 | + INSTALL_ARCH_DIR=x86 | ||
14 | + JRE_ARCH_DIR=x86 | ||
15 | ARCH_PREFIX=${LINUX32} | ||
16 | - CROSS_TARGET_ARCH=i386 | ||
17 | + CROSS_TARGET_ARCH=x86 | ||
18 | ARCHFLAG="-m32" | ||
19 | ;; | ||
20 | alpha*) | ||
21 | @@ -765,7 +765,7 @@ | ||
22 | ZERO_LIBARCH="${INSTALL_ARCH_DIR}" | ||
23 | dnl can't use AC_CHECK_SIZEOF on multilib | ||
24 | case "${ZERO_LIBARCH}" in | ||
25 | - i386|ppc|s390|sparc) | ||
26 | + x86|ppc|s390|sparc) | ||
27 | ZERO_BITSPERWORD=32 | ||
28 | ;; | ||
29 | amd64|ppc64|s390x|sparc64) | ||
30 | @@ -777,7 +777,7 @@ | ||
31 | esac | ||
32 | AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"]) | ||
33 | case "${ZERO_LIBARCH}" in | ||
34 | - i386) | ||
35 | + x86) | ||
36 | ZERO_ARCHDEF="IA32" | ||
37 | ;; | ||
38 | ppc*) | ||
diff --git a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-unbreak-float.patch b/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-unbreak-float.patch deleted file mode 100644 index 9f875de..0000000 --- a/recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-unbreak-float.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100 | ||
4 | +++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100 | ||
5 | @@ -27,13 +27,11 @@ | ||
6 | |||
7 | #include "jfdlibm.h" | ||
8 | |||
9 | -#ifdef __NEWVALID /* special setup for Sun test regime */ | ||
10 | #if defined(i386) || defined(i486) || \ | ||
11 | defined(intel) || defined(x86) || \ | ||
12 | defined(i86pc) || defined(_M_IA64) || defined(ia64) | ||
13 | #define _LITTLE_ENDIAN | ||
14 | #endif | ||
15 | -#endif | ||
16 | |||
17 | #ifdef _LITTLE_ENDIAN | ||
18 | #define __HI(x) *(1+(int*)&x) | ||
diff --git a/recipes-core/icedtea/icedtea6-native.inc b/recipes-core/icedtea/icedtea6-native.inc deleted file mode 100644 index 43377ce..0000000 --- a/recipes-core/icedtea/icedtea6-native.inc +++ /dev/null | |||
@@ -1,215 +0,0 @@ | |||
1 | DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools" | ||
2 | HOMEPAGE = "http://icedtea.classpath.org" | ||
3 | LICENSE = "GPL-2.0-with-classpath-exception" | ||
4 | INC_PR = "r5" | ||
5 | |||
6 | DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ | ||
7 | xalan-j-native xerces-j-native rhino-native \ | ||
8 | ant-native \ | ||
9 | libx11-native xproto-native libxt-native libxext-native \ | ||
10 | freetype-native zlib-native giflib-native jpeg-native \ | ||
11 | zip-native \ | ||
12 | " | ||
13 | |||
14 | inherit native java autotools | ||
15 | |||
16 | JAVA_HOME[unexport] = "1" | ||
17 | |||
18 | # No parallel build yet. | ||
19 | PARALLEL_MAKE = "" | ||
20 | |||
21 | # openjdk-ecj looks in /usr/include and /usr/lib for freetype by default. | ||
22 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" | ||
23 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" | ||
24 | |||
25 | # Configure options compatible with Cacao >= 0.99 only! | ||
26 | EXTRA_OECONF = "\ | ||
27 | --with-parallel-jobs=1 \ | ||
28 | --disable-docs \ | ||
29 | --disable-pulse-java \ | ||
30 | --disable-plugin \ | ||
31 | --disable-xrender \ | ||
32 | \ | ||
33 | --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-bootstrap \ | ||
34 | \ | ||
35 | --with-ecj-jar=${STAGING_DATADIR_JAVA_NATIVE}/ecj-bootstrap.jar \ | ||
36 | --with-java=${STAGING_BINDIR_NATIVE}/java \ | ||
37 | --with-javac=${STAGING_BINDIR_NATIVE}/ecj-bootstrap \ | ||
38 | --with-javah=${STAGING_BINDIR_NATIVE}/gjavah \ | ||
39 | --with-jar=${STAGING_BINDIR_NATIVE}/fastjar \ | ||
40 | --with-rmic=${STAGING_BINDIR_NATIVE}/grmic \ | ||
41 | --with-xalan2-jar=${STAGING_DATADIR_NATIVE}/java/xalan2.jar \ | ||
42 | --with-xalan2-serializer-jar=${STAGING_DATADIR_NATIVE}/java/serializer.jar \ | ||
43 | --with-xerces2-jar=${STAGING_DATADIR_NATIVE}/java/xercesImpl.jar \ | ||
44 | --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \ | ||
45 | --with-openjdk-src-dir=${WORKDIR}/openjdk-src-dir \ | ||
46 | --with-gcj-home=${WORKDIR}/fake-jdk \ | ||
47 | \ | ||
48 | --enable-openjdk-cross-compilation \ | ||
49 | " | ||
50 | |||
51 | JDK_DIR = "icedtea6-native" | ||
52 | |||
53 | JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" | ||
54 | |||
55 | do_configure_prepend() { | ||
56 | |||
57 | case "${TARGET_ARCH}" in | ||
58 | x86_64) | ||
59 | libarch=amd64 | ||
60 | ;; | ||
61 | i386|i486|i586|i686) | ||
62 | libarch=x86 | ||
63 | ;; | ||
64 | *) | ||
65 | arch=${TARGET_ARCH} | ||
66 | libarch=${TARGET_ARCH} | ||
67 | ;; | ||
68 | esac | ||
69 | |||
70 | chmod -R ug+w ${WORKDIR}/openjdk-src-dir | ||
71 | (cd ${WORKDIR}/openjdk-src-dir && sh ${S}/fsg.sh) | ||
72 | |||
73 | # Automatically copy everything that starts with "icedtea" and ends with | ||
74 | # ".patch" into the patches directory. | ||
75 | find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; | ||
76 | |||
77 | # Prepare JDK-like directory with Classpath' files which we can treat as a | ||
78 | # SYSTEM_GCJ_DIR afterwards. | ||
79 | mkdir -p ${WORKDIR}/fake-jdk/jre/lib/ | ||
80 | ln -sf ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip ${WORKDIR}/fake-jdk/jre/lib/rt.jar | ||
81 | |||
82 | mkdir -p ${WORKDIR}/fake-jdk/include | ||
83 | for i in ${STAGING_INCDIR_NATIVE}/classpath/* ;do | ||
84 | test -r $i | continue; | ||
85 | bn=`basename $i` | ||
86 | ln -sf $i ${WORKDIR}/fake-jdk/include/$bn; | ||
87 | done | ||
88 | } | ||
89 | |||
90 | do_configure_append() { | ||
91 | oe_runmake patch-ecj | ||
92 | |||
93 | for F in openjdk-ecj/jdk/make/common/shared/Compiler-gcc.gmk openjdk-ecj/corba/make/common/shared/Compiler-gcc.gmk ; | ||
94 | do | ||
95 | sed -i \ | ||
96 | -e"s|\$(COMPILER_PATH)gcc\$(GCC_SUFFIX)|${CC}|" \ | ||
97 | -e"s|\$(COMPILER_PATH)gcc\$(GCC_SUFFIX) -E|${CPP}|" \ | ||
98 | -e"s|\$(COMPILER_PATH)g++\$(GCC_SUFFIX)|${CXX}|" \ | ||
99 | -e"s|-mimpure-text||" \ | ||
100 | $F | ||
101 | done | ||
102 | |||
103 | for F in openjdk-ecj/hotspot/make/linux/makefiles/gcc.make openjdk-ecj/hotspot/agent/src/os/linux/Makefile ; | ||
104 | do | ||
105 | sed -i \ | ||
106 | -e"s|gcc\$(GCC_SUFFIX)|${CC}|" \ | ||
107 | -e"s|g++\$(GCC_SUFFIX)|${CXX}|" \ | ||
108 | $F | ||
109 | done | ||
110 | } | ||
111 | |||
112 | EXTRA_OEMAKE = ' \ | ||
113 | ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \ | ||
114 | ' | ||
115 | |||
116 | do_compile() { | ||
117 | # OpenJDK uses slightly different names for certain arches. We need to know | ||
118 | # this to create some files which are expected by the build. | ||
119 | case "${TARGET_ARCH}" in | ||
120 | x86_64) | ||
121 | arch=amd64 | ||
122 | libarch=amd64 | ||
123 | ;; | ||
124 | i386|i486|i586|i686) | ||
125 | arch=x86 | ||
126 | libarch=x86 | ||
127 | ;; | ||
128 | *) | ||
129 | arch=${TARGET_ARCH} | ||
130 | libarch=${TARGET_ARCH} | ||
131 | ;; | ||
132 | esac | ||
133 | |||
134 | install -d openjdk-ecj/control/build/linux-$arch/hotspot/import/jre/lib | ||
135 | if [ $libarch != $arch ]; then | ||
136 | # Something is strange with the directoy naming. OpenJDK uses both variants. | ||
137 | ln -sf $libarch openjdk-ecj/control/build/linux-$arch/hotspot/import/jre/lib/$arch | ||
138 | fi | ||
139 | |||
140 | |||
141 | # First build hotspot to get a libjvm.so | ||
142 | bbnote "1/2 Building Hotspot" | ||
143 | oe_runmake hotspot | ||
144 | |||
145 | # Remove the strange recursive symlink that is created here (If it is not there, then just skip this). | ||
146 | rm -f bootstrap/ecj/jre/lib/$libarch || true | ||
147 | |||
148 | # Copy libjvm.so for target into bootstrap/jdk1.6.0/jre/lib | ||
149 | install -d bootstrap/ecj/jre/lib/$libarch | ||
150 | cp openjdk-ecj/build/linux-$arch/j2sdk-image/jre/lib/$libarch/server/libjvm.so bootstrap/ecj/jre/lib/$libarch | ||
151 | |||
152 | # OpenJDK build expects these files to exist (by creating those files we pretend | ||
153 | # that stuff was compiled) | ||
154 | common_dir=openjdk-ecj/build/linux-$arch/tmp/sun | ||
155 | for D in javax.sound/jsoundalsa sun.awt.X11/xawt sun.awt/jawt; | ||
156 | do | ||
157 | bbnote "creating $common_dir/$D/obj64/.files_compiled" | ||
158 | install -d $common_dir/$D/obj64 | ||
159 | touch $common_dir/$D/obj64/.files_compiled | ||
160 | |||
161 | bbnote "creating $common_dir/$D/obj/.files_compiled" | ||
162 | install -d $common_dir/$D/obj | ||
163 | touch $common_dir/$D/obj/.files_compiled | ||
164 | done | ||
165 | |||
166 | # now use the jni.h from the hotspot | ||
167 | #cp | ||
168 | |||
169 | bbnote "2/2 Running make icedtea-against-ecj" | ||
170 | # Now cross-compile bootstrap JDK | ||
171 | rm stamps/icedtea-against-ecj.stamp stamps/icedtea-ecj.stamp || true | ||
172 | oe_runmake icedtea-against-ecj | ||
173 | |||
174 | # Creates a nice symlink which allows us to reach the created files easily. | ||
175 | oe_runmake stamps/bootstrap-directory-symlink.stamp | ||
176 | } | ||
177 | |||
178 | do_install() { | ||
179 | case "${TARGET_ARCH}" in | ||
180 | x86_64) | ||
181 | JDK_ARCH=amd64 | ||
182 | ;; | ||
183 | i386|i486|i586|i686) | ||
184 | JDK_ARCH=x86 | ||
185 | ;; | ||
186 | *) | ||
187 | JDK_ARCH=${TARGET_ARCH} | ||
188 | ;; | ||
189 | esac | ||
190 | |||
191 | install -d ${JDK_INSTALL_DIR} | ||
192 | |||
193 | for F in bootstrap/icedtea/bin bootstrap/icedtea/include bootstrap/icedtea/jre bootstrap/icedtea/lib | ||
194 | do | ||
195 | cp -RL $F ${JDK_INSTALL_DIR} | ||
196 | done | ||
197 | |||
198 | install -d ${JDK_INSTALL_DIR}/include/hpi | ||
199 | cp openjdk-ecj/jdk/src/solaris/hpi/export/*.h ${JDK_INSTALL_DIR}/include/hpi | ||
200 | cp openjdk-ecj/jdk/src/share/hpi/export/*.h ${JDK_INSTALL_DIR}/include/hpi | ||
201 | |||
202 | install -d ${JDK_INSTALL_DIR}/include/javavm | ||
203 | cp openjdk-ecj/jdk/src/share/javavm/export/*.h ${JDK_INSTALL_DIR}/include/javavm | ||
204 | cp openjdk-ecj/jdk/src/solaris/javavm/export/*.h ${JDK_INSTALL_DIR}/include/javavm | ||
205 | |||
206 | install -d ${JDK_INSTALL_DIR}/generated | ||
207 | cp generated/sun/awt/X11/generator/sizer.32 ${JDK_INSTALL_DIR}/generated | ||
208 | |||
209 | # Fix libjvm.so dependency of libfontmanager.so | ||
210 | ln -sf server/libjvm.so ${JDK_INSTALL_DIR}/jre/lib/${JDK_ARCH}/libjvm.so | ||
211 | ln -sf server/libjvm.so ${JDK_INSTALL_DIR}/jre/lib/${JDK_ARCH}/libjvm.so.0 | ||
212 | |||
213 | # Fix missing write permissions on the files. | ||
214 | chmod ug+w -R ${JDK_INSTALL_DIR} | ||
215 | } | ||
diff --git a/recipes-core/icedtea/icedtea6-native_1.8.11.bb b/recipes-core/icedtea/icedtea6-native_1.8.11.bb deleted file mode 100644 index 78d24e6..0000000 --- a/recipes-core/icedtea/icedtea6-native_1.8.11.bb +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | # Note: DO NOT USE THIS PACKAGE. While the build is fine, the resulting JDK | ||
2 | # is unable to compile itself yet (some issue with the built-in XML parser). | ||
3 | require ${PN}.inc | ||
4 | |||
5 | FILESPATH =. "${FILE_DIRNAME}/icedtea6-native-${PV}:" | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
8 | |||
9 | PR = "${INC_PR}.3" | ||
10 | |||
11 | SRC_URI = "\ | ||
12 | http://icedtea.wildebeest.org/download/source/icedtea6-${PV}.tar.gz;name=iced \ | ||
13 | http://download.java.net/openjdk/jdk6/promoted/b18/openjdk-6-src-b18-16_feb_2010.tar.gz;subdir=openjdk-src-dir;name=ojdk \ | ||
14 | ${JAXWS_URI} \ | ||
15 | ${JAF_URI} \ | ||
16 | ${JAXP_URI} \ | ||
17 | file://disable-library-checks.patch \ | ||
18 | file://build-hacks-native.patch \ | ||
19 | file://icedtea-sane-x86-arch-name.patch \ | ||
20 | file://icedtea-fix-jar-path.patch \ | ||
21 | file://icedtea-openjdk-remove-currency-data-generation-expi.patch;patchdir=../openjdk-src-dir \ | ||
22 | ${ICEDTEA_PATCHES} \ | ||
23 | " | ||
24 | SRC_URI[ojdk.md5sum] = "94db01691ab38f98b7d42b2ebf4d5c0b" | ||
25 | SRC_URI[ojdk.sha256sum] = "778ea7b323aaa24d3c6e8fe32b8bb0f49040d9e86271859077ada9f9ee3c8ebf" | ||
26 | SRC_URI[iced.md5sum] = "e0edfb08a4eedf1b9f1cef26a9bd4ab4" | ||
27 | SRC_URI[iced.sha256sum] = "6eb418ec0609080a71bda16896124d6e1ac23b2f54af52e05fc22c719e12ca29" | ||
28 | |||
29 | JAXWS_URI = "http://icedtea.wildebeest.org/download/source/drops/jdk6-jaxws-2009_10_27.zip;name=jaxws" | ||
30 | SRC_URI[jaxws.md5sum] = "3ea5728706169498b722b898a1008acf" | ||
31 | SRC_URI[jaxws.sha256sum] = "155ff3be83c980e197621a2fbf7ee34e8e0f536489351a5865cf0e52206245e2" | ||
32 | |||
33 | JAF_URI = "http://icedtea.wildebeest.org/download/source/drops/jdk6-jaf-2009_10_27.zip;name=jaf" | ||
34 | SRC_URI[jaf.md5sum] = "7a50bb540a27cdd0001885630088b758" | ||
35 | SRC_URI[jaf.sha256sum] = "fdc51476fc6bcc69ea1f099f33e84601a126bfa8b11c8fa11c25dc574345aa9f" | ||
36 | |||
37 | JAXP_URI = "http://download.java.net/jaxp/openjdk/jdk6/jdk6-jaxp-2009_10_13.zip;name=jaxp" | ||
38 | SRC_URI[jaxp.md5sum] = "a2f7b972124cd776ff71e7754eb9a429" | ||
39 | SRC_URI[jaxp.sha256sum] = "8714d55de18db48ca9da0ee986202005082f44cf4c215da8683342b70e61792b" | ||
40 | |||
41 | |||
42 | ICEDTEA_PATCHES = "\ | ||
43 | file://icedtea-ecj-disable-compilation.patch;apply=no \ | ||
44 | file://icedtea-ecj-fix-freetype.patch;apply=no \ | ||
45 | file://icedtea-ecj-fix-zlib.patch;apply=no \ | ||
46 | file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ | ||
47 | file://icedtea-jdk-sane-x86-arch.patch;apply=no \ | ||
48 | file://icedtea-unbreak-float.patch;apply=no \ | ||
49 | file://icedtea-jdk-avoid-cdef-collision.patch;apply=no \ | ||
50 | file://icedtea-hotspot-dont-return-booleans.patch;apply=no \ | ||
51 | file://icedtea-native-vsyscall.patch;apply=no \ | ||
52 | " | ||
53 | |||
54 | export DISTRIBUTION_PATCHES = "\ | ||
55 | patches/icedtea-ecj-disable-compilation.patch \ | ||
56 | patches/icedtea-ecj-fix-freetype.patch \ | ||
57 | patches/icedtea-ecj-fix-zlib.patch \ | ||
58 | patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ | ||
59 | patches/icedtea-jdk-sane-x86-arch.patch \ | ||
60 | patches/icedtea-unbreak-float.patch \ | ||
61 | patches/icedtea-jdk-avoid-cdef-collision.patch \ | ||
62 | patches/icedtea-hotspot-dont-return-booleans.patch \ | ||
63 | patches/icedtea-native-vsyscall.patch \ | ||
64 | " | ||
65 | |||
66 | EXTRA_OECONF += " --with-jaxws-drop-zip=${DL_DIR}/jdk6-jaxws-2009_10_27.zip \ | ||
67 | --with-jaf-drop-zip=${DL_DIR}/jdk6-jaf-2009_10_27.zip \ | ||
68 | --with-jaxp-drop-zip=${DL_DIR}/jdk6-jaxp-2009_10_13.zip " | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch deleted file mode 100644 index 8812cf2..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | Index: icedtea6/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6.orig/Makefile.am 2011-12-21 21:24:25.000000000 +0100 | ||
4 | +++ icedtea6/Makefile.am 2011-12-21 22:50:11.649227590 +0100 | ||
5 | @@ -538,6 +538,11 @@ | ||
6 | JAVAC="" \ | ||
7 | JAVA_HOME="" \ | ||
8 | JDK_HOME="" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | + OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \ | ||
14 | DISTRIBUTION_ID="$(DIST_ID)" \ | ||
15 | DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ | ||
16 | DEBUG_CLASSFILES="true" \ | ||
17 | @@ -1851,12 +1856,16 @@ | ||
18 | if BUILD_JAMVM | ||
19 | cd jamvm/jamvm && \ | ||
20 | LDFLAGS="-Xlinker -z -Xlinker noexecstack" \ | ||
21 | - ./autogen.sh --with-java-runtime-library=openjdk \ | ||
22 | - --prefix=$(abs_top_builddir)/jamvm/install ; \ | ||
23 | - $(MAKE) ; \ | ||
24 | - $(MAKE) install | ||
25 | + $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk \ | ||
26 | + --prefix=/usr/lib \ | ||
27 | + --host=$(host_alias) \ | ||
28 | + --build=$(build_alias) \ | ||
29 | + --target=$(target_alias) \ | ||
30 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \ | ||
31 | + $(ARCH_PREFIX) $(MAKE) ; \ | ||
32 | + $(ARCH_PREFIX) $(MAKE) install DESTDIR=$(abs_top_builddir)/jamvm/install | ||
33 | mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
34 | - cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
35 | + cp $(abs_top_builddir)/jamvm/install/usr/lib/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
36 | ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client | ||
37 | touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt | ||
38 | ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so | ||
39 | @@ -1874,7 +1883,7 @@ | ||
40 | stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp | ||
41 | if ADD_JAMVM_BUILD | ||
42 | mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm | ||
43 | - install -m 644 jamvm/install/lib/libjvm.so \ | ||
44 | + install -m 644 jamvm/install/usr/lib/lib/libjvm.so \ | ||
45 | $(BUILD_JRE_ARCH_DIR)/jamvm/ | ||
46 | printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg | ||
47 | else | ||
48 | @@ -1918,6 +1927,7 @@ | ||
49 | --host=$(host_alias) \ | ||
50 | --build=$(build_alias) \ | ||
51 | --target=$(target_alias) \ | ||
52 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \ | ||
53 | --prefix=$(abs_top_builddir)/cacao/install \ | ||
54 | --with-java-runtime-library=openjdk \ | ||
55 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ | ||
56 | @@ -1984,7 +1994,7 @@ | ||
57 | # configure script arguments, quoted in single quotes | ||
58 | CONFIGURE_ARGS = @CONFIGURE_ARGS@ | ||
59 | ADD_ZERO_CONFIGURE_ARGS = \ | ||
60 | - --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \ | ||
61 | + --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \ | ||
62 | --enable-zero | ||
63 | if ADD_SHARK_BUILD | ||
64 | ADD_ZERO_CONFIGURE_ARGS += \ | ||
65 | Index: icedtea6/javac.in | ||
66 | =================================================================== | ||
67 | --- icedtea6.orig/javac.in 2011-12-21 21:24:30.000000000 +0100 | ||
68 | +++ icedtea6/javac.in 2011-12-21 22:44:25.860460813 +0100 | ||
69 | @@ -45,7 +45,9 @@ | ||
70 | my @CLASSPATH = ('@ECJ_JAR@'); | ||
71 | push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; | ||
72 | $ENV{"CLASSPATH"} = join ':', @CLASSPATH; | ||
73 | - exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args; | ||
74 | + # Compiling hotspot-tools consumes tons of memory and exceeds any default | ||
75 | + # limits for jamvm and cacao. | ||
76 | + exec '@JAVA@', '-Xmx1024m', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args; | ||
77 | } | ||
78 | else | ||
79 | { | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/cacao-arm-ucontext.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-arm-ucontext.patch deleted file mode 100644 index c21fcf1..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/cacao-arm-ucontext.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Index: cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c | ||
2 | =================================================================== | ||
3 | --- cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c 2013-01-26 21:30:54.206581090 +0100 | ||
4 | +++ cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c 2013-01-26 21:31:34.406991316 +0100 | ||
5 | @@ -28,19 +28,7 @@ | ||
6 | |||
7 | #include <stdint.h> | ||
8 | |||
9 | -#define ucontext broken_glibc_ucontext | ||
10 | -#define ucontext_t broken_glibc_ucontext_t | ||
11 | #include <ucontext.h> | ||
12 | -#undef ucontext | ||
13 | -#undef ucontext_t | ||
14 | - | ||
15 | -typedef struct ucontext { | ||
16 | - unsigned long uc_flags; | ||
17 | - struct ucontext *uc_link; | ||
18 | - stack_t uc_stack; | ||
19 | - struct sigcontext uc_mcontext; | ||
20 | - sigset_t uc_sigmask; | ||
21 | -} ucontext_t; | ||
22 | |||
23 | #define scontext_t struct sigcontext | ||
24 | |||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/cacao-libtoolize.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-libtoolize.patch deleted file mode 100644 index 484cb10..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/cacao-libtoolize.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: icedtea6/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6.orig/Makefile.am 2011-12-21 22:58:23.000000000 +0100 | ||
4 | +++ icedtea6/Makefile.am 2011-12-21 23:00:21.405887186 +0100 | ||
5 | @@ -1922,6 +1922,7 @@ | ||
6 | if BUILD_CACAO | ||
7 | if !USE_SYSTEM_CACAO | ||
8 | cd cacao/cacao && \ | ||
9 | + rm -f libtool && \ | ||
10 | ./autogen.sh && \ | ||
11 | $(ARCH_PREFIX) ./configure \ | ||
12 | --host=$(host_alias) \ | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch deleted file mode 100644 index 95cb802..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: icedtea6-1.11.5/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.11.5.orig/Makefile.am 2013-01-27 21:47:24.609119623 +0100 | ||
4 | +++ icedtea6-1.11.5/Makefile.am 2013-01-27 21:49:31.250516775 +0100 | ||
5 | @@ -1993,6 +1993,8 @@ | ||
6 | if BUILD_CACAO | ||
7 | if !USE_SYSTEM_CACAO | ||
8 | cd cacao/cacao && \ | ||
9 | + patch -p1 -N < $(abs_top_srcdir)/patches/cacao-loadavg.patch && \ | ||
10 | + patch -p1 -N < $(abs_top_srcdir)/patches/cacao-arm-ucontext.patch && \ | ||
11 | rm -f libtool && \ | ||
12 | ./autogen.sh && \ | ||
13 | $(ARCH_PREFIX) ./configure \ | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch deleted file mode 100644 index 0fc1a81..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | Index: cacao-cff92704c4e0/src/vm/os.hpp | ||
2 | =================================================================== | ||
3 | --- cacao-cff92704c4e0/src/vm/os.hpp 2011-12-08 13:40:45.000000000 +0100 | ||
4 | +++ cacao-cff92704c4e0/src/vm/os.hpp 2011-12-20 11:42:36.985633921 +0100 | ||
5 | @@ -425,7 +425,21 @@ | ||
6 | #if defined(HAVE_GETLOADAVG) | ||
7 | return ::getloadavg(loadavg, nelem); | ||
8 | #else | ||
9 | -# error getloadavg not available | ||
10 | + FILE *LOADAVG; | ||
11 | + double avg[3] = { 0.0, 0.0, 0.0 }; | ||
12 | + int i, res = -1;; | ||
13 | + | ||
14 | + if ((LOADAVG = fopen("/proc/loadavg", "r"))) { | ||
15 | + fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]); | ||
16 | + res = 0; | ||
17 | + fclose(LOADAVG); | ||
18 | + } | ||
19 | + | ||
20 | + for (i = 0; (i < nelem) && (i < 3); i++) { | ||
21 | + loadavg[i] = avg[i]; | ||
22 | + } | ||
23 | + | ||
24 | + return res; | ||
25 | #endif | ||
26 | } | ||
27 | |||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch deleted file mode 100644 index bef699f..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | Index: icedtea6/acinclude.m4 | ||
2 | =================================================================== | ||
3 | --- icedtea6.orig/acinclude.m4 2011-12-20 02:25:50.000000000 +0100 | ||
4 | +++ icedtea6/acinclude.m4 2011-12-20 18:02:08.340386576 +0100 | ||
5 | @@ -928,6 +928,21 @@ | ||
6 | AC_SUBST(ALT_CACAO_SRC_DIR) | ||
7 | ]) | ||
8 | |||
9 | +AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD], | ||
10 | +[ | ||
11 | + AC_MSG_CHECKING(for compiler used for subsidiary programs) | ||
12 | + AC_ARG_WITH([cc-for-build], | ||
13 | + [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)], | ||
14 | + [ | ||
15 | + CC_FOR_BUILD="${withval}" | ||
16 | + ], | ||
17 | + [ | ||
18 | + CC_FOR_BUILD="\$(CC)" | ||
19 | + ]) | ||
20 | + AC_MSG_RESULT(${CC_FOR_BUILD}) | ||
21 | + AC_SUBST(CC_FOR_BUILD) | ||
22 | +]) | ||
23 | + | ||
24 | AC_DEFUN([IT_WITH_GCJ], | ||
25 | [ | ||
26 | AC_MSG_CHECKING([whether to compile ecj natively]) | ||
27 | Index: icedtea6/Makefile.am | ||
28 | =================================================================== | ||
29 | --- icedtea6.orig/Makefile.am 2011-12-20 17:59:27.000000000 +0100 | ||
30 | +++ icedtea6/Makefile.am 2011-12-20 18:04:32.972312064 +0100 | ||
31 | @@ -538,6 +538,7 @@ | ||
32 | JAVAC="" \ | ||
33 | JAVA_HOME="" \ | ||
34 | JDK_HOME="" \ | ||
35 | + CC_FOR_BUILD="$(CC_FOR_BUILD)" \ | ||
36 | OE_CFLAGS="$(OE_CFLAGS)" \ | ||
37 | OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
38 | OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
39 | Index: icedtea6/configure.ac | ||
40 | =================================================================== | ||
41 | --- icedtea6.orig/configure.ac 2011-12-20 02:25:50.000000000 +0100 | ||
42 | +++ icedtea6/configure.ac 2011-12-20 18:03:04.534043885 +0100 | ||
43 | @@ -18,6 +18,8 @@ | ||
44 | AC_PROG_CC | ||
45 | AC_PROG_CXX | ||
46 | |||
47 | +AC_CHECK_WITH_CC_FOR_BUILD | ||
48 | + | ||
49 | IT_FIND_TOOL([MAKE], [make]) | ||
50 | IT_FIND_TOOL([GZIP], [gzip]) | ||
51 | IT_FIND_TOOL([ANT], [ant]) | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-crosscompile-fix.patch deleted file mode 100644 index f268290..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-crosscompile-fix.patch +++ /dev/null | |||
@@ -1,270 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/sun/awt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/sun/awt/Makefile 2009-01-24 17:54:57.000000000 +0100 | ||
4 | +++ openjdk/jdk/make/sun/awt/Makefile 2009-01-24 17:55:07.000000000 +0100 | ||
5 | @@ -509,10 +509,10 @@ | ||
6 | # | ||
7 | |||
8 | ifeq ($(PLATFORM), linux) | ||
9 | -CPPFLAGS += -I$(MOTIF_DIR)/include \ | ||
10 | - -I$(OPENWIN_HOME)/include \ | ||
11 | - -I$(OPENWIN_HOME)/include/X11/extensions \ | ||
12 | - -I$(PLATFORM_SRC)/native/$(PKGDIR)/font | ||
13 | +#CPPFLAGS += -I$(MOTIF_DIR)/include \ | ||
14 | +# -I$(OPENWIN_HOME)/include \ | ||
15 | +# -I$(OPENWIN_HOME)/include/X11/extensions \ | ||
16 | +CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font | ||
17 | endif | ||
18 | CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
19 | -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ | ||
20 | @@ -536,7 +536,7 @@ | ||
21 | $(EVENT_MODEL) | ||
22 | |||
23 | ifeq ($(PLATFORM), linux) | ||
24 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
25 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
26 | endif | ||
27 | |||
28 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
29 | Index: openjdk/jdk/make/sun/awt/mawt.gmk | ||
30 | =================================================================== | ||
31 | --- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:54:57.000000000 +0100 | ||
32 | +++ openjdk/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:55:07.000000000 +0100 | ||
33 | @@ -194,8 +194,8 @@ | ||
34 | CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
35 | |||
36 | ifndef HEADLESS | ||
37 | -CPPFLAGS += -I$(OPENWIN_HOME)/include | ||
38 | -LDFLAGS += -L$(OPENWIN_LIB) | ||
39 | +#CPPFLAGS += -I$(OPENWIN_HOME)/include | ||
40 | +#LDFLAGS += -L$(OPENWIN_LIB) | ||
41 | |||
42 | endif # !HEADLESS | ||
43 | |||
44 | @@ -223,8 +223,8 @@ | ||
45 | |||
46 | ifeq ($(PLATFORM), linux) | ||
47 | # Checking for the X11/extensions headers at the additional location | ||
48 | - CPPFLAGS += -I/X11R6/include/X11/extensions \ | ||
49 | - -I/usr/include/X11/extensions | ||
50 | +# CPPFLAGS += -I/X11R6/include/X11/extensions \ | ||
51 | +# -I/usr/include/X11/extensions | ||
52 | endif | ||
53 | |||
54 | ifeq ($(PLATFORM), solaris) | ||
55 | Index: openjdk/jdk/make/sun/xawt/Makefile | ||
56 | =================================================================== | ||
57 | --- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-01-24 17:54:57.000000000 +0100 | ||
58 | +++ openjdk/jdk/make/sun/xawt/Makefile 2009-01-24 17:55:07.000000000 +0100 | ||
59 | @@ -123,11 +123,12 @@ | ||
60 | -I$(PLATFORM_SRC)/native/sun/awt | ||
61 | |||
62 | ifeq ($(PLATFORM), linux) | ||
63 | +# Very unsuitable for cross-compilation. | ||
64 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
65 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
66 | - -I/usr/include/X11/extensions \ | ||
67 | - -I$(MOTIF_DIR)/include \ | ||
68 | - -I$(OPENWIN_HOME)/include | ||
69 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
70 | +# -I/usr/include/X11/extensions \ | ||
71 | +# -I$(MOTIF_DIR)/include \ | ||
72 | +# -I$(OPENWIN_HOME)/include | ||
73 | endif | ||
74 | |||
75 | ifeq ($(PLATFORM), solaris) | ||
76 | Index: openjdk/hotspot/make/linux/makefiles/vm.make | ||
77 | =================================================================== | ||
78 | --- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:54:57.000000000 +0100 | ||
79 | +++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:55:07.000000000 +0100 | ||
80 | @@ -170,6 +170,7 @@ | ||
81 | LIBS_VM += $(LLVM_LIBS) | ||
82 | endif | ||
83 | |||
84 | +LFLAGS_VM += $(OE_LDFLAGS) | ||
85 | LINK_VM = $(LINK_LIB.c) | ||
86 | |||
87 | # rule for building precompiled header | ||
88 | Index: openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
89 | =================================================================== | ||
90 | --- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:54:57.000000000 +0100 | ||
91 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:55:07.000000000 +0100 | ||
92 | @@ -343,7 +343,7 @@ | ||
93 | echo "rm -f Queens.class"; \ | ||
94 | echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ | ||
95 | echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ | ||
96 | - echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ | ||
97 | + echo 'echo Silently skipping the execution of the gamma program'; \ | ||
98 | ) > $@ | ||
99 | $(QUIETLY) chmod +x $@ | ||
100 | |||
101 | Index: openjdk/corba/make/common/Defs-linux.gmk | ||
102 | =================================================================== | ||
103 | --- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100 | ||
104 | +++ openjdk/corba/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100 | ||
105 | @@ -82,9 +82,9 @@ | ||
106 | CC_NO_OPT = | ||
107 | |||
108 | ifeq ($(PRODUCT), java) | ||
109 | - _OPT = $(CC_HIGHER_OPT) | ||
110 | + _OPT = $(OE_CFLAGS) | ||
111 | else | ||
112 | - _OPT = $(CC_LOWER_OPT) | ||
113 | + _OPT = $(OE_CFLAGS) | ||
114 | CPPFLAGS_DBG += -DLOGGING | ||
115 | endif | ||
116 | |||
117 | @@ -94,7 +94,7 @@ | ||
118 | # as the default. | ||
119 | CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN | ||
120 | CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
121 | -CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN | ||
122 | +CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
123 | CFLAGS_REQUIRED_hppa += | ||
124 | CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
125 | CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
126 | @@ -221,7 +221,7 @@ | ||
127 | # | ||
128 | # -L paths for finding and -ljava | ||
129 | # | ||
130 | -LDFLAGS_OPT = -Xlinker -O1 | ||
131 | +LDFLAGS_OPT = $(OE_LDFLAGS) | ||
132 | LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) | ||
133 | LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
134 | |||
135 | Index: openjdk/jdk/make/common/Defs-linux.gmk | ||
136 | =================================================================== | ||
137 | --- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100 | ||
138 | +++ openjdk/jdk/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100 | ||
139 | @@ -92,9 +92,9 @@ | ||
140 | CC_NO_OPT = | ||
141 | |||
142 | ifeq ($(PRODUCT), java) | ||
143 | - _OPT = $(CC_HIGHER_OPT) | ||
144 | + _OPT = $(OE_CFLAGS) | ||
145 | else | ||
146 | - _OPT = $(CC_LOWER_OPT) | ||
147 | + _OPT = $(OE_CFLAGS) | ||
148 | CPPFLAGS_DBG += -DLOGGING | ||
149 | endif | ||
150 | |||
151 | @@ -104,7 +104,7 @@ | ||
152 | # as the default. | ||
153 | CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN | ||
154 | CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
155 | -CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN | ||
156 | +CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
157 | CFLAGS_REQUIRED_hppa += | ||
158 | CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
159 | CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
160 | @@ -231,7 +231,7 @@ | ||
161 | # | ||
162 | # -L paths for finding and -ljava | ||
163 | # | ||
164 | -LDFLAGS_OPT = -Xlinker -O1 | ||
165 | +LDFLAGS_OPT = $(OE_LDFLAGS) | ||
166 | LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) | ||
167 | LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
168 | |||
169 | Index: openjdk/hotspot/make/linux/makefiles/gcc.make | ||
170 | =================================================================== | ||
171 | --- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:54:57.000000000 +0100 | ||
172 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:55:07.000000000 +0100 | ||
173 | @@ -119,7 +119,7 @@ | ||
174 | CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) | ||
175 | |||
176 | # The flags to use for an Optimized g++ build | ||
177 | -OPT_CFLAGS += -O3 | ||
178 | +OPT_CFLAGS += $(OE_CFLAGS) | ||
179 | |||
180 | # Hotspot uses very unstrict aliasing turn this optimization off | ||
181 | OPT_CFLAGS += -fno-strict-aliasing | ||
182 | @@ -148,7 +148,7 @@ | ||
183 | endif | ||
184 | |||
185 | # Enable linker optimization | ||
186 | -LFLAGS += -Xlinker -O1 | ||
187 | +LFLAGS += $(OE_LDFLAGS) | ||
188 | |||
189 | # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. | ||
190 | MAPFLAG = -Xlinker --version-script=FILENAME | ||
191 | Index: openjdk/hotspot/make/linux/makefiles/launcher.make | ||
192 | =================================================================== | ||
193 | --- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:55:19.000000000 +0100 | ||
194 | +++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:56:05.000000000 +0100 | ||
195 | @@ -44,7 +44,7 @@ | ||
196 | LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) | ||
197 | else | ||
198 | LAUNCHER.o = launcher.o | ||
199 | - LFLAGS_LAUNCHER += -L `pwd` | ||
200 | + LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS) | ||
201 | LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ | ||
202 | endif | ||
203 | |||
204 | Index: icedtea6-1.8.5/build/openjdk/jdk/make/sun/xawt/Makefile | ||
205 | =================================================================== | ||
206 | --- openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:17:03.926207269 +0100 | ||
207 | +++ openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:30:11.956186631 +0100 | ||
208 | @@ -245,7 +245,7 @@ | ||
209 | $(CHMOD) +w $@;\ | ||
210 | else \ | ||
211 | $(ECHO) GENERATING $@; \ | ||
212 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
213 | + $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
214 | fi | ||
215 | @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
216 | $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
217 | diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher | ||
218 | index f59a9d6..6edc880 100644 | ||
219 | --- openjdk/jdk/make/launchers/Makefile.launcher | ||
220 | +++ openjdk/jdk/make/launchers/Makefile.launcher | ||
221 | @@ -152,7 +152,7 @@ endif | ||
222 | ifeq ($(GUI_TOOL),true) | ||
223 | ifneq ($(PLATFORM), windows) | ||
224 | # Anything with a GUI needs X11 to be linked in. | ||
225 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 | ||
226 | + OTHER_LDLIBS += -lX11 | ||
227 | endif | ||
228 | endif | ||
229 | |||
230 | diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile | ||
231 | index 2021434..9035da7 100644 | ||
232 | --- openjdk/jdk/make/sun/jawt/Makefile | ||
233 | +++ openjdk/jdk/make/sun/jawt/Makefile | ||
234 | @@ -98,8 +98,7 @@ else # PLATFORM | ||
235 | # | ||
236 | # Other extra flags needed for compiling. | ||
237 | # | ||
238 | -CPPFLAGS += -I$(OPENWIN_HOME)/include \ | ||
239 | - -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
240 | +CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
241 | -I$(SHARE_SRC)/native/$(PKGDIR)/image \ | ||
242 | -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \ | ||
243 | -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \ | ||
244 | diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile | ||
245 | index 6693e2a..58d05f1 100644 | ||
246 | --- openjdk/jdk/make/sun/splashscreen/Makefile | ||
247 | +++ openjdk/jdk/make/sun/splashscreen/Makefile | ||
248 | @@ -63,8 +63,7 @@ CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE | ||
249 | |||
250 | ifneq ($(PLATFORM), windows) | ||
251 | CFLAGS += -DWITH_X11 | ||
252 | - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
253 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
254 | + OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
255 | else # PLATFORM | ||
256 | CFLAGS += -DWITH_WIN32 | ||
257 | OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib | ||
258 | diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile | ||
259 | index 440699b..ffa177d 100644 | ||
260 | --- openjdk/jdk/make/sun/xawt/Makefile | ||
261 | +++ openjdk/jdk/make/sun/xawt/Makefile | ||
262 | @@ -46,8 +46,6 @@ include FILES_export_unix.gmk | ||
263 | AUTO_FILES_JAVA_DIRS = sun/awt/X11 | ||
264 | AUTO_JAVA_PRUNE = WrapperGenerator.java | ||
265 | |||
266 | -LDFLAGS += -L$(OPENWIN_LIB) | ||
267 | - | ||
268 | # For Xrender extension. | ||
269 | ifeq ($(PLATFORM), solaris) | ||
270 | LDFLAGS += -L/usr/openwin/sfw/lib$(ISA_DIR) -R/usr/openwin/sfw/lib$(ISA_DIR) | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-fix-xrender.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-fix-xrender.patch deleted file mode 100644 index 4bd8b2c..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-fix-xrender.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 2011-10-19 16:56:03.014276748 +0200 | ||
4 | +++ openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 2011-10-19 16:57:19.942658211 +0200 | ||
5 | @@ -29,7 +29,7 @@ | ||
6 | #include "X11SurfaceData.h" | ||
7 | |||
8 | /*#include <xcb/xcb.h>*/ | ||
9 | -#include <Xrender.h> | ||
10 | +#include <X11/extensions/Xrender.h> | ||
11 | |||
12 | #ifndef RepeatNone /* added in 0.10 */ | ||
13 | #define RepeatNone 0 | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hostbuildcc.patch deleted file mode 100644 index 5f2c98b..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hostbuildcc.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: openjdk/hotspot/make/linux/makefiles/rules.make | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:22:33.201668748 +0100 | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:23:08.480415783 +0100 | ||
5 | @@ -39,6 +39,7 @@ | ||
6 | # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++). | ||
7 | C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) | ||
8 | CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) | ||
9 | +CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS) | ||
10 | |||
11 | AS.S = $(AS) $(ASFLAGS) | ||
12 | |||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-dlvsym-uclibc.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-dlvsym-uclibc.patch deleted file mode 100644 index 657f722..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-dlvsym-uclibc.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Index: openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-12-20 19:15:05.000000000 +0100 | ||
4 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-12-20 19:18:22.411503442 +0100 | ||
5 | @@ -2593,10 +2593,7 @@ | ||
6 | // If we are running with earlier version, which did not have symbol versions, | ||
7 | // we should use the base version. | ||
8 | void* os::Linux::libnuma_dlsym(void* handle, const char *name) { | ||
9 | - void *f = dlvsym(handle, name, "libnuma_1.1"); | ||
10 | - if (f == NULL) { | ||
11 | - f = dlsym(handle, name); | ||
12 | - } | ||
13 | + void *f = dlsym(handle, name); | ||
14 | return f; | ||
15 | } | ||
16 | |||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch deleted file mode 100644 index faa90ea..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:22:13.696298239 +0200 | ||
4 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:24:15.308790737 +0200 | ||
5 | @@ -49,7 +49,6 @@ | ||
6 | # include <string.h> | ||
7 | # include <syscall.h> | ||
8 | # include <sys/sysinfo.h> | ||
9 | -# include <gnu/libc-version.h> | ||
10 | # include <sys/ipc.h> | ||
11 | # include <sys/shm.h> | ||
12 | # include <link.h> | ||
13 | @@ -544,9 +543,7 @@ | ||
14 | os::Linux::set_glibc_version(str); | ||
15 | } else { | ||
16 | // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version() | ||
17 | - static char _gnu_libc_version[32]; | ||
18 | - jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version), | ||
19 | - "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release()); | ||
20 | + static char _gnu_libc_version[32] = "2.9"; | ||
21 | os::Linux::set_glibc_version(_gnu_libc_version); | ||
22 | } | ||
23 | |||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isfinte.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isfinte.patch deleted file mode 100644 index 7c5da59..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isfinte.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:28.576131825 +0200 | ||
4 | +++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:55.555711815 +0200 | ||
5 | @@ -235,8 +235,8 @@ | ||
6 | |||
7 | // Checking for finiteness | ||
8 | |||
9 | -inline int g_isfinite(jfloat f) { return finite(f); } | ||
10 | -inline int g_isfinite(jdouble f) { return finite(f); } | ||
11 | +inline int g_isfinite(jfloat f) { return isfinite(f); } | ||
12 | +inline int g_isfinite(jdouble f) { return isfinite(f); } | ||
13 | |||
14 | |||
15 | // Wide characters | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isnanf.patch deleted file mode 100644 index 494e965..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isnanf.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:47:12.695674808 +0200 | ||
4 | +++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:48:08.699007491 +0200 | ||
5 | @@ -220,14 +220,14 @@ | ||
6 | // checking for nanness | ||
7 | #ifdef SOLARIS | ||
8 | #ifdef SPARC | ||
9 | -inline int g_isnan(float f) { return isnanf(f); } | ||
10 | +inline int g_isnan(float f) { return __isnanf(f); } | ||
11 | #else | ||
12 | // isnanf() broken on Intel Solaris use isnand() | ||
13 | inline int g_isnan(float f) { return isnand(f); } | ||
14 | #endif | ||
15 | inline int g_isnan(double f) { return isnand(f); } | ||
16 | #elif LINUX | ||
17 | -inline int g_isnan(float f) { return isnanf(f); } | ||
18 | +inline int g_isnan(float f) { return __isnanf(f); } | ||
19 | inline int g_isnan(double f) { return isnan(f); } | ||
20 | #else | ||
21 | #error "missing platform-specific definition here" | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch deleted file mode 100644 index 7da41fd..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:16:09.406334411 +0200 | ||
4 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:19:38.952152043 +0200 | ||
5 | @@ -4325,7 +4325,22 @@ | ||
6 | // Linux doesn't yet have a (official) notion of processor sets, | ||
7 | // so just return the system wide load average. | ||
8 | int os::loadavg(double loadavg[], int nelem) { | ||
9 | - return ::getloadavg(loadavg, nelem); | ||
10 | + | ||
11 | + FILE *LOADAVG; | ||
12 | + double avg[3] = { 0.0, 0.0, 0.0 }; | ||
13 | + int i, res = -1;; | ||
14 | + | ||
15 | + if ((LOADAVG = fopen("/proc/loadavg", "r"))) { | ||
16 | + fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]); | ||
17 | + res = 0; | ||
18 | + fclose(LOADAVG); | ||
19 | + } | ||
20 | + | ||
21 | + for (i = 0; (i < nelem) && (i < 3); i++) { | ||
22 | + loadavg[i] = avg[i]; | ||
23 | + } | ||
24 | + | ||
25 | + return res; | ||
26 | } | ||
27 | |||
28 | void os::pause() { | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-iconv-uclibc.patch deleted file mode 100644 index 68f8581..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-iconv-uclibc.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/java/npt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200 | ||
4 | +++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +0200 | ||
5 | @@ -65,6 +65,8 @@ | ||
6 | # We don't want to link against -ljava | ||
7 | JAVALIB= | ||
8 | |||
9 | +LDLIBS += -liconv | ||
10 | + | ||
11 | # Add -export options to explicitly spell exported symbols | ||
12 | ifeq ($(PLATFORM), windows) | ||
13 | OTHER_LCF += -export:nptInitialize -export:nptTerminate | ||
14 | Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile | ||
15 | =================================================================== | ||
16 | --- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200 | ||
17 | +++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +0200 | ||
18 | @@ -123,6 +123,8 @@ | ||
19 | # We don't want to link against -ljava | ||
20 | JAVALIB= | ||
21 | |||
22 | +LDLIBS += -liconv | ||
23 | + | ||
24 | # | ||
25 | # Add to ambient vpath so we pick up the library files | ||
26 | # | ||
27 | Index: openjdk/jdk/make/sun/splashscreen/Makefile | ||
28 | =================================================================== | ||
29 | --- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200 | ||
30 | +++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200 | ||
31 | @@ -55,6 +55,8 @@ | ||
32 | |||
33 | JAVALIB= | ||
34 | |||
35 | +LDLIBS += -liconv | ||
36 | + | ||
37 | # | ||
38 | # C Flags | ||
39 | # | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch deleted file mode 100644 index cc5e4e8..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | http://mail.openjdk.java.net/pipermail/zero-dev/2010-June/000346.html | ||
2 | |||
3 | this cute C code does the same thing on powerpc as the assembly code that | ||
4 | was here before. If the compiler was built with the SPE extensions instead | ||
5 | of traditional FPU and double operations are performed in HW then we are | ||
6 | one step further: The compiler turns this into evldd & evstdd. Voila :) | ||
7 | |||
8 | This C code could also be activated on s390. The compiler turns this into | ||
9 | a single mvc instruction which does the copy operation. I don't know if | ||
10 | mvc's copy ability is atomic _or_ not and therefore I leave it as it. | ||
11 | |||
12 | Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de> | ||
13 | |||
14 | ./openjdk-src-dir/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | ||
15 | Index: openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | ||
16 | =================================================================== | ||
17 | --- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp.org 2011-11-14 14:07:32.000000000 -0800 | ||
18 | +++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2012-07-19 07:28:26.208405923 -0700 | ||
19 | @@ -25,6 +25,16 @@ | ||
20 | |||
21 | #ifndef OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP | ||
22 | #define OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP | ||
23 | +#if defined(PPC) && !defined(_LP64) | ||
24 | + | ||
25 | +#ifndef __NO_FPRS__ | ||
26 | +#define ATOMIC64_COPY_THROUGH_DOUBLE 1 | ||
27 | + | ||
28 | +#elif defined(__SPE__) && !defined(_SOFT_DOUBLE) | ||
29 | +#define ATOMIC64_COPY_THROUGH_DOUBLE 1 | ||
30 | + | ||
31 | +#endif | ||
32 | +#endif | ||
33 | |||
34 | static void setup_fpu() {} | ||
35 | |||
36 | @@ -36,12 +46,23 @@ | ||
37 | |||
38 | // Atomically copy 64 bits of data | ||
39 | static void atomic_copy64(volatile void *src, volatile void *dst) { | ||
40 | -#if defined(PPC) && !defined(_LP64) | ||
41 | - double tmp; | ||
42 | - asm volatile ("lfd %0, 0(%1)\n" | ||
43 | - "stfd %0, 0(%2)\n" | ||
44 | - : "=f"(tmp) | ||
45 | - : "b"(src), "b"(dst)); | ||
46 | +#if ATOMIC64_COPY_THROUGH_DOUBLE | ||
47 | + /* | ||
48 | + * In order to copy 8 bytes atomicly we rely on the trick that some | ||
49 | + * architectures can load and store a double as a single operation. | ||
50 | + * gcc picks the correct opcode here and with optimization turned on | ||
51 | + * all temporary assignments are gone. - bigeasy | ||
52 | + */ | ||
53 | + union { | ||
54 | + double *d; | ||
55 | + volatile void *v; | ||
56 | + } s, d; | ||
57 | + | ||
58 | + s.v = src; | ||
59 | + d.v = dst; | ||
60 | + | ||
61 | + *d.d = *s.d; | ||
62 | + | ||
63 | #elif defined(S390) && !defined(_LP64) | ||
64 | double tmp; | ||
65 | asm volatile ("ld %0, 0(%1)\n" | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-remove-unused-backtrace.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-remove-unused-backtrace.patch deleted file mode 100644 index 5423fde..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-remove-unused-backtrace.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:45:56.607257503 +0200 | ||
4 | +++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:47:19.727254686 +0200 | ||
5 | @@ -27,9 +27,6 @@ | ||
6 | #include <X11/Xutil.h> | ||
7 | #include <X11/Xos.h> | ||
8 | #include <X11/Xatom.h> | ||
9 | -#ifdef __linux__ | ||
10 | -#include <execinfo.h> | ||
11 | -#endif | ||
12 | |||
13 | #include <jvm.h> | ||
14 | #include <jni.h> | ||
15 | @@ -689,26 +686,6 @@ | ||
16 | return ret; | ||
17 | } | ||
18 | |||
19 | -#ifdef __linux__ | ||
20 | -void print_stack(void) | ||
21 | -{ | ||
22 | - void *array[10]; | ||
23 | - size_t size; | ||
24 | - char **strings; | ||
25 | - size_t i; | ||
26 | - | ||
27 | - size = backtrace (array, 10); | ||
28 | - strings = backtrace_symbols (array, size); | ||
29 | - | ||
30 | - fprintf (stderr, "Obtained %zd stack frames.\n", size); | ||
31 | - | ||
32 | - for (i = 0; i < size; i++) | ||
33 | - fprintf (stderr, "%s\n", strings[i]); | ||
34 | - | ||
35 | - free (strings); | ||
36 | -} | ||
37 | -#endif | ||
38 | - | ||
39 | Window get_xawt_root_shell(JNIEnv *env) { | ||
40 | static jclass classXRootWindow = NULL; | ||
41 | static jmethodID methodGetXRootWindow = NULL; | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch deleted file mode 100644 index acd3e1e..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile | ||
2 | index bdc1f8f..76f0c00 100644 | ||
3 | --- openjdk/jdk/make/com/sun/jmx/Makefile | ||
4 | +++ openjdk/jdk/make/com/sun/jmx/Makefile | ||
5 | @@ -102,7 +102,7 @@ FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/ | ||
6 | # when available, we need to run with latest rmic version available. rmic | ||
7 | # launch tool not built at this stage but we can invoke via rmi class. | ||
8 | |||
9 | -RMIC_JAVA = $(OUTPUTDIR)/bin/java | ||
10 | +RMIC_JAVA = $(BOOTDIR)/bin/java | ||
11 | # need to treat 64bit solaris differently | ||
12 | ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) | ||
13 | RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch deleted file mode 100644 index 54d6a19..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | Disable xawt and jawt along with sizes generation which does not work well if | ||
2 | you cant generated sizes in cross env. So for architectures which dont have | ||
3 | working qemu this is an option | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | Upstream-Status: Inappropriate [Cross-compile specific hack] | ||
7 | |||
8 | --- openjdk/jdk/make/sun/xawt/Makefile.khem 2012-07-21 23:54:47.396405922 -0700 | ||
9 | +++ openjdk/jdk/make/sun/xawt/Makefile 2012-07-21 23:55:52.032405922 -0700 | ||
10 | @@ -245,18 +245,19 @@ | ||
11 | $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) | ||
12 | |||
13 | $(SIZES): $(SIZERS) | ||
14 | - @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
15 | - $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
16 | - $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
17 | - $(CHMOD) +w $@;\ | ||
18 | - else \ | ||
19 | - $(ECHO) GENERATING $@; \ | ||
20 | - $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
21 | - fi | ||
22 | - @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
23 | - $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
24 | - $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
25 | - fi | ||
26 | + touch $(SIZES) | ||
27 | +# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ | ||
28 | +# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ | ||
29 | +# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ | ||
30 | +# $(CHMOD) +w $@;\ | ||
31 | +# else \ | ||
32 | +# $(ECHO) GENERATING $@; \ | ||
33 | +# $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
34 | +# fi | ||
35 | +# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
36 | +# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
37 | +# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
38 | +# fi | ||
39 | |||
40 | $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) | ||
41 | $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ | ||
42 | --- openjdk/jdk/make/sun/Makefile.khem 2011-11-14 14:11:40.000000000 -0800 | ||
43 | +++ openjdk/jdk/make/sun/Makefile 2012-07-22 00:42:04.980409296 -0700 | ||
44 | @@ -50,7 +50,7 @@ | ||
45 | MOTIF_SUBDIRS = motif12 motif21 | ||
46 | endif | ||
47 | HEADLESS_SUBDIR = headless | ||
48 | - XAWT_SUBDIR = xawt | ||
49 | + XAWT_SUBDIR = | ||
50 | endif | ||
51 | |||
52 | ifndef OPENJDK | ||
53 | @@ -65,7 +65,7 @@ | ||
54 | awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \ | ||
55 | $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ | ||
56 | font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ | ||
57 | - jawt text nio launcher management $(ORG_SUBDIR) \ | ||
58 | + text nio launcher management $(ORG_SUBDIR) \ | ||
59 | native2ascii serialver tools jconsole | ||
60 | |||
61 | all build clean clobber:: | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-unpack-uclibc.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-unpack-uclibc.patch deleted file mode 100644 index 40564f0..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-unpack-uclibc.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/com/sun/java/pack/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:21.548426411 +0200 | ||
4 | +++ openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:43.858007543 +0200 | ||
5 | @@ -103,6 +103,7 @@ | ||
6 | OTHER_LDLIBS += $(LIBCXX) -lc | ||
7 | # setup the list of libraries to link in... | ||
8 | ifeq ($(PLATFORM), linux) | ||
9 | + OTHER_LDLIBS += -lpthread | ||
10 | ifeq ("$(CC_VER_MAJOR)", "3") | ||
11 | OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic | ||
12 | endif | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch deleted file mode 100644 index b97745d..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: openjdk/hotspot/make/linux/makefiles/launcher.make | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/make/linux/makefiles/launcher.make 2011-12-20 10:33:37.000000000 +0100 | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/launcher.make 2011-12-20 10:37:54.055022618 +0100 | ||
5 | @@ -51,7 +51,7 @@ | ||
6 | else | ||
7 | LAUNCHER.o = launcher.o | ||
8 | LFLAGS_LAUNCHER += -L `pwd` | ||
9 | - LIBS_LAUNCHER += -l$(JVM) $(LIBS) | ||
10 | + LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ | ||
11 | ifeq ($(SHARK_BUILD), true) | ||
12 | LFLAGS_LAUNCHER += $(LLVM_LDFLAGS) | ||
13 | LIBS_LAUNCHER += $(LLVM_LIBS) | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-libnet-renaming.patch deleted file mode 100644 index 024969d..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-libnet-renaming.patch +++ /dev/null | |||
@@ -1,148 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/java/net/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/make/java/net/Makefile 2010-07-05 12:28:58.476625401 +0200 | ||
4 | +++ openjdk/jdk/make/java/net/Makefile 2010-07-05 12:29:11.876625138 +0200 | ||
5 | @@ -25,7 +25,7 @@ | ||
6 | |||
7 | BUILDDIR = ../.. | ||
8 | PACKAGE = java.net | ||
9 | -LIBRARY = net | ||
10 | +LIBRARY = javanet | ||
11 | PRODUCT = sun | ||
12 | include $(BUILDDIR)/common/Defs.gmk | ||
13 | |||
14 | Index: openjdk/jdk/make/java/nio/Makefile | ||
15 | =================================================================== | ||
16 | --- openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:31:27.046626250 +0200 | ||
17 | +++ openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:32:06.647874890 +0200 | ||
18 | @@ -139,11 +139,11 @@ | ||
19 | endif | ||
20 | ifeq ($(PLATFORM), linux) | ||
21 | COMPILER_WARNINGS_FATAL=true | ||
22 | -OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl | ||
23 | +OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl | ||
24 | endif | ||
25 | ifeq ($(PLATFORM), solaris) | ||
26 | OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \ | ||
27 | - -L$(LIBDIR)/$(LIBARCH) -ljava -lnet | ||
28 | + -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet | ||
29 | endif # PLATFORM | ||
30 | |||
31 | # | ||
32 | Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java | ||
33 | =================================================================== | ||
34 | --- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:40:56.467876415 +0200 | ||
35 | +++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:41:43.326628410 +0200 | ||
36 | @@ -58,7 +58,7 @@ | ||
37 | */ | ||
38 | static { | ||
39 | java.security.AccessController.doPrivileged( | ||
40 | - new sun.security.action.LoadLibraryAction("net")); | ||
41 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
42 | } | ||
43 | |||
44 | /** | ||
45 | Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java | ||
46 | =================================================================== | ||
47 | --- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:01.027875484 +0200 | ||
48 | +++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:56.826626386 +0200 | ||
49 | @@ -74,7 +74,7 @@ | ||
50 | */ | ||
51 | static { | ||
52 | java.security.AccessController.doPrivileged( | ||
53 | - new sun.security.action.LoadLibraryAction("net")); | ||
54 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
55 | } | ||
56 | |||
57 | /** | ||
58 | Index: openjdk/jdk/src/share/classes/java/net/DatagramPacket.java | ||
59 | =================================================================== | ||
60 | --- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:41:02.017875980 +0200 | ||
61 | +++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:42:06.057875677 +0200 | ||
62 | @@ -47,7 +47,7 @@ | ||
63 | */ | ||
64 | static { | ||
65 | java.security.AccessController.doPrivileged( | ||
66 | - new sun.security.action.LoadLibraryAction("net")); | ||
67 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
68 | init(); | ||
69 | } | ||
70 | |||
71 | Index: openjdk/jdk/src/share/classes/java/net/InetAddress.java | ||
72 | =================================================================== | ||
73 | --- openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:41:02.756626429 +0200 | ||
74 | +++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:42:15.997875786 +0200 | ||
75 | @@ -230,7 +230,7 @@ | ||
76 | static { | ||
77 | preferIPv6Address = java.security.AccessController.doPrivileged( | ||
78 | new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue(); | ||
79 | - AccessController.doPrivileged(new LoadLibraryAction("net")); | ||
80 | + AccessController.doPrivileged(new LoadLibraryAction("javanet")); | ||
81 | init(); | ||
82 | } | ||
83 | |||
84 | Index: openjdk/jdk/src/share/classes/java/net/NetworkInterface.java | ||
85 | =================================================================== | ||
86 | --- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:41:03.547875282 +0200 | ||
87 | +++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:42:22.647875475 +0200 | ||
88 | @@ -52,7 +52,7 @@ | ||
89 | private boolean virtual = false; | ||
90 | |||
91 | static { | ||
92 | - AccessController.doPrivileged(new LoadLibraryAction("net")); | ||
93 | + AccessController.doPrivileged(new LoadLibraryAction("javanet")); | ||
94 | init(); | ||
95 | } | ||
96 | |||
97 | Index: openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java | ||
98 | =================================================================== | ||
99 | --- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:41:04.306628153 +0200 | ||
100 | +++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:42:32.666627264 +0200 | ||
101 | @@ -89,7 +89,7 @@ | ||
102 | }}); | ||
103 | if (b != null && b.booleanValue()) { | ||
104 | java.security.AccessController.doPrivileged( | ||
105 | - new sun.security.action.LoadLibraryAction("net")); | ||
106 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
107 | hasSystemProxies = init(); | ||
108 | } | ||
109 | } | ||
110 | Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/share/classes/sun/nio/ch/Util.java | ||
111 | =================================================================== | ||
112 | --- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:41:05.086626745 +0200 | ||
113 | +++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:42:39.266626410 +0200 | ||
114 | @@ -354,7 +354,7 @@ | ||
115 | return; | ||
116 | loaded = true; | ||
117 | java.security.AccessController | ||
118 | - .doPrivileged(new sun.security.action.LoadLibraryAction("net")); | ||
119 | + .doPrivileged(new sun.security.action.LoadLibraryAction("javanet")); | ||
120 | java.security.AccessController | ||
121 | .doPrivileged(new sun.security.action.LoadLibraryAction("nio")); | ||
122 | // IOUtil must be initialized; Its native methods are called from | ||
123 | Index: openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java | ||
124 | =================================================================== | ||
125 | --- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:05.896626691 +0200 | ||
126 | +++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:45.606625991 +0200 | ||
127 | @@ -244,7 +244,7 @@ | ||
128 | |||
129 | static { | ||
130 | java.security.AccessController.doPrivileged( | ||
131 | - new sun.security.action.LoadLibraryAction("net")); | ||
132 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
133 | } | ||
134 | |||
135 | } | ||
136 | Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java | ||
137 | =================================================================== | ||
138 | --- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:06.786627210 +0200 | ||
139 | +++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:51.926627747 +0200 | ||
140 | @@ -160,7 +160,7 @@ | ||
141 | |||
142 | static { | ||
143 | java.security.AccessController.doPrivileged( | ||
144 | - new sun.security.action.LoadLibraryAction("net")); | ||
145 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
146 | init0(); | ||
147 | |||
148 | // start the address listener thread | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-remove_werror.patch deleted file mode 100644 index f2ad035..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-remove_werror.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Index: openjdk/hotspot/make/linux/makefiles/gcc.make | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:35.758533706 +0100 | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:42.761456458 +0100 | ||
5 | @@ -98,9 +98,6 @@ | ||
6 | CFLAGS += -pipe | ||
7 | endif | ||
8 | |||
9 | -# Compiler warnings are treated as errors | ||
10 | -WARNINGS_ARE_ERRORS = -Werror | ||
11 | - | ||
12 | # Except for a few acceptable ones | ||
13 | # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit | ||
14 | # conversions which might affect the values. To avoid that, we need to turn | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-shark-arm-linux-cpu-detection.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-shark-arm-linux-cpu-detection.patch deleted file mode 100644 index f40bc51..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-shark-arm-linux-cpu-detection.patch +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | Index: openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:42:48.412103129 +0200 | ||
4 | +++ openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:50:51.680282178 +0200 | ||
5 | @@ -32,6 +32,96 @@ | ||
6 | |||
7 | #if SHARK_LLVM_VERSION >= 27 | ||
8 | namespace { | ||
9 | + | ||
10 | +#if defined(__arm__) && defined(__linux__) | ||
11 | +#include <fcntl.h> | ||
12 | +#include <linux/auxvec.h> | ||
13 | +#include <asm/hwcap.h> | ||
14 | +#define VECBUFF_SIZE 32 | ||
15 | + | ||
16 | +bool TestARMLinuxHWCAP(int feature) { | ||
17 | + int fd; | ||
18 | + unsigned vecs[VECBUFF_SIZE]; | ||
19 | + unsigned *p; | ||
20 | + int i, n; | ||
21 | + int rc; | ||
22 | + | ||
23 | + rc = 0; | ||
24 | + fd = open("/proc/self/auxv", O_RDONLY); | ||
25 | + if (fd < 0) return 0; | ||
26 | + do { | ||
27 | + n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned)); | ||
28 | + p = vecs; | ||
29 | + i = n/8; | ||
30 | + while (--i >=0) { | ||
31 | + unsigned tag = *p++; | ||
32 | + unsigned value = *p++; | ||
33 | + if (tag == 0) goto fini; | ||
34 | + if(tag == AT_HWCAP && (value & feature)) { | ||
35 | + rc = 1; | ||
36 | + goto fini; | ||
37 | + } | ||
38 | + } | ||
39 | + } while (n == VECBUFF_SIZE * sizeof(unsigned)); | ||
40 | +fini: | ||
41 | + close(fd); | ||
42 | + return rc; | ||
43 | +} | ||
44 | + | ||
45 | +char* TestARMLinuxAT(int auxvec) { | ||
46 | + int fd; | ||
47 | + unsigned vecs[VECBUFF_SIZE]; | ||
48 | + unsigned *p; | ||
49 | + int i, n; | ||
50 | + char* rc; | ||
51 | + | ||
52 | + rc = 0; | ||
53 | + fd = open("/proc/self/auxv", O_RDONLY); | ||
54 | + if (fd < 0) return 0; | ||
55 | + do { | ||
56 | + n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned)); | ||
57 | + p = vecs; | ||
58 | + i = n/8; | ||
59 | + while (--i >=0) { | ||
60 | + unsigned tag = *p++; | ||
61 | + unsigned value = *p++; | ||
62 | + if (tag == 0) goto fini; | ||
63 | + if(tag == (unsigned) auxvec ) { | ||
64 | + rc = (char*)value; | ||
65 | + goto fini; | ||
66 | + } | ||
67 | + } | ||
68 | + } while (n == VECBUFF_SIZE * sizeof(unsigned)); | ||
69 | +fini: | ||
70 | + close(fd); | ||
71 | + return rc; | ||
72 | +} | ||
73 | + | ||
74 | +bool getARMHostCPUFeatures(StringMap<bool> &Features) { | ||
75 | + // FIXME LLVM PR6561 // Features["neon"]=TestARMLinuxHWCAP(HWCAP_NEON); | ||
76 | + Features["thumb2"]=TestARMLinuxHWCAP(HWCAP_THUMBEE); | ||
77 | + Features["vfp2"]=TestARMLinuxHWCAP(HWCAP_VFP); | ||
78 | + | ||
79 | + std::string testArchKey(TestARMLinuxAT(AT_PLATFORM)); | ||
80 | + | ||
81 | + StringMap<std::string> archLinuxToLLVMMap; | ||
82 | + archLinuxToLLVMMap["v4l"]="v4t"; | ||
83 | + archLinuxToLLVMMap["v5l"]="v5t"; | ||
84 | + archLinuxToLLVMMap["v6l"]="v6"; | ||
85 | + // FIXME change this from v6 to v7a when LLVM PR7048 have been fixed | ||
86 | + archLinuxToLLVMMap["v7l"]="v6"; | ||
87 | + | ||
88 | + llvm::StringMapIterator<std::string> resultIterator(archLinuxToLLVMMap.find( | ||
89 | + testArchKey)); | ||
90 | + if(resultIterator->first()) { | ||
91 | + std::string arch(resultIterator->second); | ||
92 | + Features[arch]=true; | ||
93 | + } | ||
94 | + | ||
95 | + return true; | ||
96 | +} | ||
97 | +#endif | ||
98 | + | ||
99 | cl::opt<std::string> | ||
100 | MCPU("mcpu"); | ||
101 | |||
102 | @@ -64,7 +154,11 @@ | ||
103 | #if SHARK_LLVM_VERSION >= 27 | ||
104 | // Finetune LLVM for the current host CPU. | ||
105 | StringMap<bool> Features; | ||
106 | +#if defined(__arm__) && defined(__linux__) | ||
107 | + bool gotCpuFeatures = getARMHostCPUFeatures(Features); | ||
108 | +#else | ||
109 | bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features); | ||
110 | +#endif | ||
111 | std::string cpu("-mcpu=" + llvm::sys::getHostCPUName()); | ||
112 | |||
113 | std::vector<const char*> args; | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-unbreak-float.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-unbreak-float.patch deleted file mode 100644 index 9f875de..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-unbreak-float.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100 | ||
4 | +++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100 | ||
5 | @@ -27,13 +27,11 @@ | ||
6 | |||
7 | #include "jfdlibm.h" | ||
8 | |||
9 | -#ifdef __NEWVALID /* special setup for Sun test regime */ | ||
10 | #if defined(i386) || defined(i486) || \ | ||
11 | defined(intel) || defined(x86) || \ | ||
12 | defined(i86pc) || defined(_M_IA64) || defined(ia64) | ||
13 | #define _LITTLE_ENDIAN | ||
14 | #endif | ||
15 | -#endif | ||
16 | |||
17 | #ifdef _LITTLE_ENDIAN | ||
18 | #define __HI(x) *(1+(int*)&x) | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch deleted file mode 100644 index ba738d6..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | Index: openjdk/hotspot/make/linux/makefiles/zeroshark.make | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/make/linux/makefiles/zeroshark.make 2011-12-20 18:24:38.000000000 +0100 | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2011-12-20 18:31:22.584884637 +0100 | ||
5 | @@ -32,13 +32,20 @@ | ||
6 | Obj_Files += thumb2.o | ||
7 | |||
8 | CFLAGS += -DHOTSPOT_ASM | ||
9 | +CCFLAGS += -DHOTSPOT_ASM | ||
10 | + | ||
11 | +ifeq ($(CROSS_COMPILATION), true) | ||
12 | + C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD) | ||
13 | +else | ||
14 | + C_COMPILE_FOR_MKBC = $(C_COMPILE) | ||
15 | +endif | ||
16 | |||
17 | cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s | ||
18 | thumb2.o: offsets_arm.s | ||
19 | |||
20 | offsets_arm.s: mkoffsets | ||
21 | @echo Generating assembler offsets | ||
22 | - ./mkoffsets > $@ | ||
23 | + $(QEMU) ./mkoffsets > $@ | ||
24 | |||
25 | bytecodes_arm.s: bytecodes_arm.def mkbc | ||
26 | @echo Generatine ARM assembler bytecode sequences | ||
27 | @@ -46,12 +53,12 @@ | ||
28 | |||
29 | mkbc: $(GAMMADIR)/tools/mkbc.c | ||
30 | @echo Compiling mkbc tool | ||
31 | - $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) | ||
32 | + $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE) | ||
33 | |||
34 | mkoffsets: asm_helper.cpp | ||
35 | @echo Compiling offset generator | ||
36 | $(QUIETLY) $(REMOVE_TARGET) | ||
37 | - $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
38 | + $(CC_COMPILE) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
39 | |||
40 | endif | ||
41 | |||
diff --git a/recipes-core/openjdk/openjdk-6-6b24/jvm.cfg b/recipes-core/openjdk/openjdk-6-6b24/jvm.cfg deleted file mode 100644 index ea97cda..0000000 --- a/recipes-core/openjdk/openjdk-6-6b24/jvm.cfg +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | # Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. | ||
2 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
3 | # | ||
4 | # This code is free software; you can redistribute it and/or modify it | ||
5 | # under the terms of the GNU General Public License version 2 only, as | ||
6 | # published by the Free Software Foundation. Sun designates this | ||
7 | # particular file as subject to the "Classpath" exception as provided | ||
8 | # by Sun in the LICENSE file that accompanied this code. | ||
9 | # | ||
10 | # This code is distributed in the hope that it will be useful, but WITHOUT | ||
11 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
12 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
13 | # version 2 for more details (a copy is included in the LICENSE file that | ||
14 | # accompanied this code). | ||
15 | # | ||
16 | # You should have received a copy of the GNU General Public License version | ||
17 | # 2 along with this work; if not, write to the Free Software Foundation, | ||
18 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
19 | # | ||
20 | # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
21 | # CA 95054 USA or visit www.sun.com if you need additional information or | ||
22 | # have any questions. | ||
23 | # | ||
24 | # | ||
25 | # List of JVMs that can be used as an option to java, javac, etc. | ||
26 | # Order is important -- first in this list is the default JVM. | ||
27 | # NOTE that this both this file and its format are UNSUPPORTED and | ||
28 | # WILL GO AWAY in a future release. | ||
29 | # | ||
30 | # You may also select a JVM in an arbitrary location with the | ||
31 | # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
32 | # and may not be available in a future release. | ||
33 | # | ||
34 | -server ERROR | ||
35 | -client IGNORE | ||
36 | -hotspot ERROR | ||
37 | -classic WARN | ||
38 | -native ERROR | ||
39 | -green ERROR | ||
40 | -zero ALIASED_TO -server | ||
41 | -shark ERROR | ||
42 | -cacao ERROR | ||
43 | -jamvm ERROR | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch deleted file mode 100644 index 1ecdef6..0000000 --- a/recipes-core/openjdk/openjdk-6-6b27/build-hacks.patch +++ /dev/null | |||
@@ -1,86 +0,0 @@ | |||
1 | Index: icedtea6-1.12.4/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.12.4.orig/Makefile.am 2013-03-04 22:31:44.256894152 +0100 | ||
4 | +++ icedtea6-1.12.4/Makefile.am 2013-03-10 14:30:16.089527572 +0100 | ||
5 | @@ -656,6 +656,11 @@ | ||
6 | JAVAC="" \ | ||
7 | JAVA_HOME="" \ | ||
8 | JDK_HOME="" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | + OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \ | ||
14 | ANT_RESPECT_JAVA_HOME="TRUE" \ | ||
15 | DISTRIBUTION_ID="$(DIST_ID)" \ | ||
16 | DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ | ||
17 | @@ -2249,10 +2254,14 @@ | ||
18 | if BUILD_JAMVM | ||
19 | cd jamvm/jamvm && \ | ||
20 | LDFLAGS="-Xlinker -z -Xlinker noexecstack" \ | ||
21 | - ./autogen.sh --with-java-runtime-library=openjdk6 \ | ||
22 | - --prefix=$(abs_top_builddir)/jamvm/install ; \ | ||
23 | - $(MAKE) ; \ | ||
24 | - $(MAKE) install | ||
25 | + $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk6 \ | ||
26 | + --prefix=$(abs_top_builddir)/jamvm/install \ | ||
27 | + --host=$(host_alias) \ | ||
28 | + --build=$(build_alias) \ | ||
29 | + --target=$(target_alias) \ | ||
30 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \ | ||
31 | + $(ARCH_PREFIX) $(MAKE) ; \ | ||
32 | + $(ARCH_PREFIX) $(MAKE) install | ||
33 | mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
34 | cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
35 | ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client | ||
36 | @@ -2316,6 +2325,7 @@ | ||
37 | --host=$(host_alias) \ | ||
38 | --build=$(build_alias) \ | ||
39 | --target=$(target_alias) \ | ||
40 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \ | ||
41 | --prefix=$(abs_top_builddir)/cacao/install \ | ||
42 | --with-java-runtime-library=openjdk \ | ||
43 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ | ||
44 | @@ -2384,7 +2394,7 @@ | ||
45 | # configure script arguments, quoted in single quotes | ||
46 | CONFIGURE_ARGS = @CONFIGURE_ARGS@ | ||
47 | ADD_ZERO_CONFIGURE_ARGS = \ | ||
48 | - --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \ | ||
49 | + --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \ | ||
50 | --enable-zero | ||
51 | if ADD_SHARK_BUILD | ||
52 | ADD_ZERO_CONFIGURE_ARGS += \ | ||
53 | Index: icedtea6-1.12.4/javac.in | ||
54 | =================================================================== | ||
55 | --- icedtea6-1.12.4.orig/javac.in 2013-03-04 22:29:36.932613635 +0100 | ||
56 | +++ icedtea6-1.12.4/javac.in 2013-03-10 14:20:35.244778409 +0100 | ||
57 | @@ -18,7 +18,7 @@ | ||
58 | { | ||
59 | my @new_args = @{$_[0]}; | ||
60 | |||
61 | - for my $opt (NO_DUP_ARGS) | ||
62 | + for my $opt (NO_DUP_ARGS) | ||
63 | { | ||
64 | my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; | ||
65 | if (@indices > 1) { | ||
66 | @@ -27,7 +27,7 @@ | ||
67 | } | ||
68 | } | ||
69 | |||
70 | - for my $opt (STRIP_ARGS) | ||
71 | + for my $opt (STRIP_ARGS) | ||
72 | { | ||
73 | my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; | ||
74 | splice @new_args, $_, 1 for @indices; | ||
75 | @@ -69,7 +69,10 @@ | ||
76 | my @CLASSPATH = ('@ECJ_JAR@'); | ||
77 | push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; | ||
78 | $ENV{"CLASSPATH"} = join ':', @CLASSPATH; | ||
79 | - exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args; | ||
80 | + | ||
81 | + # Compiling hotspot-tools consumes tons of memory and exceeds any default | ||
82 | + # limits for jamvm and cacao. | ||
83 | + exec '@JAVA@', '-Xmx1024m', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args; | ||
84 | } | ||
85 | else | ||
86 | { | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch deleted file mode 100644 index 9741ed0..0000000 --- a/recipes-core/openjdk/openjdk-6-6b27/fix_hotspot_crosscompile.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | Index: icedtea6-1.12.4/acinclude.m4 | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.12.4.orig/acinclude.m4 2013-03-04 22:29:36.000000000 +0100 | ||
4 | +++ icedtea6-1.12.4/acinclude.m4 2013-03-10 13:45:56.032412186 +0100 | ||
5 | @@ -938,6 +938,21 @@ | ||
6 | AC_SUBST(ALT_CACAO_SRC_DIR) | ||
7 | ]) | ||
8 | |||
9 | +AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD], | ||
10 | +[ | ||
11 | + AC_MSG_CHECKING(for compiler used for subsidiary programs) | ||
12 | + AC_ARG_WITH([cc-for-build], | ||
13 | + [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)], | ||
14 | + [ | ||
15 | + CC_FOR_BUILD="${withval}" | ||
16 | + ], | ||
17 | + [ | ||
18 | + CC_FOR_BUILD="\$(CC)" | ||
19 | + ]) | ||
20 | + AC_MSG_RESULT(${CC_FOR_BUILD}) | ||
21 | + AC_SUBST(CC_FOR_BUILD) | ||
22 | +]) | ||
23 | + | ||
24 | AC_DEFUN([IT_WITH_GCJ], | ||
25 | [ | ||
26 | AC_MSG_CHECKING([whether to compile ecj natively]) | ||
27 | Index: icedtea6-1.12.4/Makefile.am | ||
28 | =================================================================== | ||
29 | --- icedtea6-1.12.4.orig/Makefile.am 2013-03-10 13:44:55.000000000 +0100 | ||
30 | +++ icedtea6-1.12.4/Makefile.am 2013-03-10 13:46:27.540523062 +0100 | ||
31 | @@ -656,6 +656,7 @@ | ||
32 | JAVAC="" \ | ||
33 | JAVA_HOME="" \ | ||
34 | JDK_HOME="" \ | ||
35 | + CC_FOR_BUILD="$(CC_FOR_BUILD)" \ | ||
36 | OE_CFLAGS="$(OE_CFLAGS)" \ | ||
37 | OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
38 | OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
39 | Index: icedtea6-1.12.4/configure.ac | ||
40 | =================================================================== | ||
41 | --- icedtea6-1.12.4.orig/configure.ac 2013-03-04 22:38:51.000000000 +0100 | ||
42 | +++ icedtea6-1.12.4/configure.ac 2013-03-10 13:45:56.032412186 +0100 | ||
43 | @@ -18,6 +18,8 @@ | ||
44 | AC_PROG_CC | ||
45 | AC_PROG_CXX | ||
46 | |||
47 | +AC_CHECK_WITH_CC_FOR_BUILD | ||
48 | + | ||
49 | IT_FIND_TOOL([MAKE], [make]) | ||
50 | IT_FIND_TOOL([GZIP], [gzip]) | ||
51 | IT_FIND_TOOL([ANT], [ant]) | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch deleted file mode 100644 index 0723954..0000000 --- a/recipes-core/openjdk/openjdk-6-6b27/icedtea-crosscompile-fix.patch +++ /dev/null | |||
@@ -1,469 +0,0 @@ | |||
1 | diff --git openjdk/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk | ||
2 | index f308203..5ba15dc 100644 | ||
3 | --- openjdk/corba/make/common/Defs-linux.gmk | ||
4 | +++ openjdk/corba/make/common/Defs-linux.gmk | ||
5 | @@ -82,9 +82,9 @@ CC_LOWER_OPT = -O2 | ||
6 | CC_NO_OPT = | ||
7 | |||
8 | ifeq ($(PRODUCT), java) | ||
9 | - _OPT = $(CC_HIGHER_OPT) | ||
10 | + _OPT = $(OE_CFLAGS) | ||
11 | else | ||
12 | - _OPT = $(CC_LOWER_OPT) | ||
13 | + _OPT = $(OE_CFLAGS) | ||
14 | CPPFLAGS_DBG += -DLOGGING | ||
15 | endif | ||
16 | |||
17 | @@ -94,7 +94,7 @@ endif | ||
18 | # as the default. | ||
19 | CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN | ||
20 | CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
21 | -CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN | ||
22 | +CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
23 | CFLAGS_REQUIRED_hppa += | ||
24 | CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
25 | CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
26 | @@ -221,7 +221,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) | ||
27 | # | ||
28 | # -L paths for finding and -ljava | ||
29 | # | ||
30 | -LDFLAGS_OPT = -Xlinker -O1 | ||
31 | +LDFLAGS_OPT = $(OE_LDFLAGS) | ||
32 | LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) | ||
33 | LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
34 | |||
35 | diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
36 | index 4ba1f0e..48cfb02 100644 | ||
37 | --- openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
38 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
39 | @@ -380,7 +380,7 @@ test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java | ||
40 | echo "rm -f Queens.class"; \ | ||
41 | echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ | ||
42 | echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ | ||
43 | - echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ | ||
44 | + echo 'echo Silently skipping the execution of the gamma program'; \ | ||
45 | ) > $@ | ||
46 | $(QUIETLY) chmod +x $@ | ||
47 | |||
48 | diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make | ||
49 | index 11de79a..c5751b2 100644 | ||
50 | --- openjdk/hotspot/make/linux/makefiles/gcc.make | ||
51 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make | ||
52 | @@ -140,7 +140,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) | ||
53 | CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) | ||
54 | |||
55 | # The flags to use for an Optimized g++ build | ||
56 | -OPT_CFLAGS += -O3 | ||
57 | +OPT_CFLAGS += $(OE_CFLAGS) | ||
58 | |||
59 | # Hotspot uses very unstrict aliasing turn this optimization off | ||
60 | OPT_CFLAGS += -fno-strict-aliasing | ||
61 | @@ -184,7 +184,7 @@ LFLAGS += -Wl,-relax | ||
62 | endif | ||
63 | |||
64 | # Enable linker optimization | ||
65 | -LFLAGS += -Xlinker -O1 | ||
66 | +LFLAGS += $(OE_LDFLAGS) | ||
67 | |||
68 | # If this is a --hash-style=gnu system, use --hash-style=both | ||
69 | # The gnu .hash section won't work on some Linux systems like SuSE 10. | ||
70 | diff --git openjdk/hotspot/make/linux/makefiles/gcc.make.orig openjdk/hotspot/make/linux/makefiles/gcc.make.orig | ||
71 | index 3d6a6b7..11de79a 100644 | ||
72 | --- openjdk/hotspot/make/linux/makefiles/gcc.make.orig | ||
73 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make.orig | ||
74 | @@ -204,7 +204,7 @@ SONAMEFLAG = -Xlinker -soname=SONAME | ||
75 | SHARED_FLAG = -shared | ||
76 | |||
77 | # Keep symbols even they are not used | ||
78 | -AOUT_FLAGS += -export-dynamic | ||
79 | +AOUT_FLAGS += -Xlinker -export-dynamic | ||
80 | |||
81 | #------------------------------------------------------------------------ | ||
82 | # Debug flags | ||
83 | diff --git openjdk/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make | ||
84 | index 18f65d9..f12a798 100644 | ||
85 | --- openjdk/hotspot/make/linux/makefiles/jsig.make | ||
86 | +++ openjdk/hotspot/make/linux/makefiles/jsig.make | ||
87 | @@ -42,7 +42,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig | ||
88 | # cause problems with interposing. See CR: 6466665 | ||
89 | # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) | ||
90 | |||
91 | -LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) | ||
92 | +LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(OE_LDFLAGS) | ||
93 | |||
94 | # DEBUG_BINARIES overrides everything, use full -g debug information | ||
95 | ifeq ($(DEBUG_BINARIES), true) | ||
96 | diff --git openjdk/hotspot/make/linux/makefiles/launcher.make openjdk/hotspot/make/linux/makefiles/launcher.make | ||
97 | index c5cf503..ae7af2e 100644 | ||
98 | --- openjdk/hotspot/make/linux/makefiles/launcher.make | ||
99 | +++ openjdk/hotspot/make/linux/makefiles/launcher.make | ||
100 | @@ -50,7 +50,7 @@ ifeq ($(LINK_INTO),AOUT) | ||
101 | LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) | ||
102 | else | ||
103 | LAUNCHER.o = launcher.o | ||
104 | - LFLAGS_LAUNCHER += -L `pwd` | ||
105 | + LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS) | ||
106 | LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ | ||
107 | ifeq ($(SHARK_BUILD), true) | ||
108 | LFLAGS_LAUNCHER += $(LLVM_LDFLAGS) | ||
109 | diff --git openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make | ||
110 | index cd8d9ef..b00ce46 100644 | ||
111 | --- openjdk/hotspot/make/linux/makefiles/vm.make | ||
112 | +++ openjdk/hotspot/make/linux/makefiles/vm.make | ||
113 | @@ -242,6 +242,7 @@ ifeq ($(SHARK_BUILD), true) | ||
114 | LIBS_VM += $(LLVM_LIBS) | ||
115 | endif | ||
116 | |||
117 | +LFLAGS_VM += $(OE_LDFLAGS) | ||
118 | LINK_VM = $(LINK_LIB.c) | ||
119 | |||
120 | # rule for building precompiled header | ||
121 | diff --git openjdk/hotspot/make/linux/makefiles/vm.make.orig openjdk/hotspot/make/linux/makefiles/vm.make.orig | ||
122 | index fa4116a..cd8d9ef 100644 | ||
123 | --- openjdk/hotspot/make/linux/makefiles/vm.make.orig | ||
124 | +++ openjdk/hotspot/make/linux/makefiles/vm.make.orig | ||
125 | @@ -143,13 +143,15 @@ COMPILER2_PATHS := $(GAMMADIR)/src/share/vm/opto | ||
126 | COMPILER2_PATHS += $(GAMMADIR)/src/share/vm/libadt | ||
127 | COMPILER2_PATHS += $(GENERATED)/adfiles | ||
128 | |||
129 | +SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark | ||
130 | + | ||
131 | # Include dirs per type. | ||
132 | Src_Dirs/CORE := $(CORE_PATHS) | ||
133 | Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS) | ||
134 | Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS) | ||
135 | Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS) | ||
136 | Src_Dirs/ZERO := $(CORE_PATHS) | ||
137 | -Src_Dirs/SHARK := $(CORE_PATHS) | ||
138 | +Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS) | ||
139 | Src_Dirs := $(Src_Dirs/$(TYPE)) | ||
140 | |||
141 | COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\* | ||
142 | diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk | ||
143 | index 4e31797..03a84dd 100644 | ||
144 | --- openjdk/jdk/make/common/Defs-linux.gmk | ||
145 | +++ openjdk/jdk/make/common/Defs-linux.gmk | ||
146 | @@ -89,9 +89,9 @@ HPIS = native | ||
147 | |||
148 | ifndef OPTIMIZATION_LEVEL | ||
149 | ifeq ($(PRODUCT), java) | ||
150 | - OPTIMIZATION_LEVEL = HIGHER | ||
151 | + OPTIMIZATION_LEVEL = $(OE_CFLAGS) | ||
152 | else | ||
153 | - OPTIMIZATION_LEVEL = LOWER | ||
154 | + OPTIMIZATION_LEVEL = $(OE_CFLAGS) | ||
155 | endif | ||
156 | endif | ||
157 | |||
158 | @@ -108,7 +108,7 @@ CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) | ||
159 | # as the default. | ||
160 | CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN | ||
161 | CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
162 | -CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN | ||
163 | +CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
164 | CFLAGS_REQUIRED_hppa += | ||
165 | CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
166 | CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
167 | @@ -249,7 +249,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) | ||
168 | # | ||
169 | # -L paths for finding and -ljava | ||
170 | # | ||
171 | -LDFLAGS_OPT = -Xlinker -O1 | ||
172 | +LDFLAGS_OPT = $(OE_LDFLAGS) | ||
173 | LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) | ||
174 | LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
175 | |||
176 | diff --git openjdk/jdk/make/common/Defs-linux.gmk.orig openjdk/jdk/make/common/Defs-linux.gmk.orig | ||
177 | index cbbf647..4e31797 100644 | ||
178 | --- openjdk/jdk/make/common/Defs-linux.gmk.orig | ||
179 | +++ openjdk/jdk/make/common/Defs-linux.gmk.orig | ||
180 | @@ -86,18 +86,22 @@ HPIS = native | ||
181 | # | ||
182 | # Default optimization | ||
183 | # | ||
184 | -CC_HIGHEST_OPT = -O3 | ||
185 | -CC_HIGHER_OPT = -O3 | ||
186 | -CC_LOWER_OPT = -O2 | ||
187 | -CC_NO_OPT = | ||
188 | |||
189 | -ifeq ($(PRODUCT), java) | ||
190 | - _OPT = $(CC_HIGHER_OPT) | ||
191 | -else | ||
192 | - _OPT = $(CC_LOWER_OPT) | ||
193 | - CPPFLAGS_DBG += -DLOGGING | ||
194 | +ifndef OPTIMIZATION_LEVEL | ||
195 | + ifeq ($(PRODUCT), java) | ||
196 | + OPTIMIZATION_LEVEL = HIGHER | ||
197 | + else | ||
198 | + OPTIMIZATION_LEVEL = LOWER | ||
199 | + endif | ||
200 | endif | ||
201 | |||
202 | +CC_OPT/NONE = | ||
203 | +CC_OPT/LOWER = -O2 | ||
204 | +CC_OPT/HIGHER = -O3 | ||
205 | +CC_OPT/HIGHEST = -O3 | ||
206 | + | ||
207 | +CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) | ||
208 | + | ||
209 | # For all platforms, do not omit the frame pointer register usage. | ||
210 | # We need this frame pointer to make it easy to walk the stacks. | ||
211 | # This should be the default on X86, but ia64 and amd64 may not have this | ||
212 | @@ -131,17 +135,13 @@ else | ||
213 | LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) | ||
214 | endif | ||
215 | |||
216 | -# Add in platform specific optimizations for all opt levels | ||
217 | -CC_HIGHEST_OPT += $(_OPT_$(ARCH)) | ||
218 | -CC_HIGHER_OPT += $(_OPT_$(ARCH)) | ||
219 | -CC_LOWER_OPT += $(_OPT_$(ARCH)) | ||
220 | - | ||
221 | -# If NO_OPTIMIZATIONS is defined in the environment, turn all optimzations off | ||
222 | -ifdef NO_OPTIMIZATIONS | ||
223 | - CC_HIGHEST_OPT = $(CC_NO_OPT) | ||
224 | - CC_HIGHER_OPT = $(CC_NO_OPT) | ||
225 | - CC_LOWER_OPT = $(CC_NO_OPT) | ||
226 | +# If this is a --hash-style=gnu system, use --hash-style=both | ||
227 | +# The gnu .hash section won't work on some Linux systems like SuSE 10. | ||
228 | +_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu') | ||
229 | +ifneq ($(_HAS_HASH_STYLE_GNU),) | ||
230 | + LDFLAGS_HASH_STYLE = -Wl,--hash-style=both | ||
231 | endif | ||
232 | +LDFLAGS_COMMON += $(LDFLAGS_HASH_STYLE) | ||
233 | |||
234 | # | ||
235 | # Selection of warning messages | ||
236 | @@ -188,19 +188,19 @@ ifeq ($(DEBUG_BINARIES), true) | ||
237 | CFLAGS_REQUIRED += $(DEBUG_FLAG) | ||
238 | endif | ||
239 | |||
240 | -CFLAGS_OPT = $(POPT) | ||
241 | +CFLAGS_OPT = $(CC_OPT) | ||
242 | CFLAGS_DBG = $(DEBUG_FLAG) | ||
243 | CFLAGS_COMMON += $(CFLAGS_REQUIRED) | ||
244 | |||
245 | CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) | ||
246 | -CXXFLAGS_OPT = $(POPT) | ||
247 | +CXXFLAGS_OPT = $(CC_OPT) | ||
248 | CXXFLAGS_DBG = $(DEBUG_FLAG) | ||
249 | CXXFLAGS_COMMON += $(CFLAGS_REQUIRED) | ||
250 | |||
251 | # FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java | ||
252 | ifeq ($(FASTDEBUG), true) | ||
253 | - CFLAGS_DBG += $(CC_LOWER_OPT) | ||
254 | - CXXFLAGS_DBG += $(CC_LOWER_OPT) | ||
255 | + CFLAGS_DBG += $(CC_OPT/LOWER) | ||
256 | + CXXFLAGS_DBG += $(CC_OPT/LOWER) | ||
257 | endif | ||
258 | |||
259 | CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' | ||
260 | @@ -221,6 +221,9 @@ endif | ||
261 | |||
262 | CPPFLAGS_OPT = | ||
263 | CPPFLAGS_DBG = -DDEBUG | ||
264 | +ifneq ($(PRODUCT), java) | ||
265 | + CPPFLAGS_DBG += -DLOGGING | ||
266 | +endif | ||
267 | |||
268 | ifdef LIBRARY | ||
269 | # Libraries need to locate other libraries at runtime, and you can tell | ||
270 | @@ -255,9 +258,8 @@ LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
271 | # statically link libgcc but will print a warning with the flag. We don't | ||
272 | # want the warning, so check gcc version first. | ||
273 | # | ||
274 | -CC_VER_MAJOR := $(shell $(CC) -dumpversion | $(SED) 's/egcs-//' | $(CUT) -d'.' -f1) | ||
275 | -ifeq ("$(CC_VER_MAJOR)", "3") | ||
276 | -OTHER_LDFLAGS += -static-libgcc | ||
277 | +ifeq ($(CC_MAJORVER),3) | ||
278 | + OTHER_LDFLAGS += -static-libgcc | ||
279 | endif | ||
280 | |||
281 | # Automatic precompiled header option to use (if COMPILE_APPROACH=batch) | ||
282 | diff --git openjdk/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile | ||
283 | index e462fba..76b56be 100644 | ||
284 | --- openjdk/jdk/make/sun/awt/Makefile | ||
285 | +++ openjdk/jdk/make/sun/awt/Makefile | ||
286 | @@ -511,10 +511,10 @@ ifneq ($(PLATFORM), windows) | ||
287 | # | ||
288 | |||
289 | ifeq ($(PLATFORM), linux) | ||
290 | -CPPFLAGS += -I$(MOTIF_DIR)/include \ | ||
291 | - -I$(OPENWIN_HOME)/include \ | ||
292 | - -I$(OPENWIN_HOME)/include/X11/extensions \ | ||
293 | - -I$(PLATFORM_SRC)/native/$(PKGDIR)/font | ||
294 | +#CPPFLAGS += -I$(MOTIF_DIR)/include \ | ||
295 | +# -I$(OPENWIN_HOME)/include \ | ||
296 | +# -I$(OPENWIN_HOME)/include/X11/extensions \ | ||
297 | +CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font | ||
298 | endif | ||
299 | CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
300 | -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ | ||
301 | @@ -538,7 +538,7 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
302 | $(EVENT_MODEL) | ||
303 | |||
304 | ifeq ($(PLATFORM), linux) | ||
305 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
306 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
307 | endif | ||
308 | |||
309 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
310 | diff --git openjdk/jdk/make/sun/awt/Makefile.orig openjdk/jdk/make/sun/awt/Makefile.orig | ||
311 | index 61f36cd..e462fba 100644 | ||
312 | --- openjdk/jdk/make/sun/awt/Makefile.orig | ||
313 | +++ openjdk/jdk/make/sun/awt/Makefile.orig | ||
314 | @@ -28,17 +28,13 @@ PACKAGE = sun.awt | ||
315 | LIBRARY = awt | ||
316 | PRODUCT = sun | ||
317 | |||
318 | -# | ||
319 | # Tell Defs.gmk that VIS is needed | ||
320 | -# | ||
321 | VIS_NEEDED=true | ||
322 | |||
323 | -include $(BUILDDIR)/common/Defs.gmk | ||
324 | - | ||
325 | -# | ||
326 | # Use highest optimization level | ||
327 | -# | ||
328 | -_OPT = $(CC_HIGHEST_OPT) | ||
329 | +OPTMIZATION_LEVEL = HIGHEST | ||
330 | + | ||
331 | +include $(BUILDDIR)/common/Defs.gmk | ||
332 | |||
333 | OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES | ||
334 | |||
335 | @@ -388,6 +384,10 @@ _FONTCONFIGS = \ | ||
336 | fontconfig.SuSE.properties \ | ||
337 | fontconfig.Ubuntu.properties \ | ||
338 | fontconfig.Fedora.properties \ | ||
339 | + fontconfig.Fedora.9.properties \ | ||
340 | + fontconfig.Fedora.10.properties \ | ||
341 | + fontconfig.Fedora.11.properties \ | ||
342 | + fontconfig.Fedora.12.properties \ | ||
343 | fontconfig.RedHat.6.properties \ | ||
344 | fontconfig.Gentoo.properties | ||
345 | else | ||
346 | diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk | ||
347 | index 44de692..9ce661c 100644 | ||
348 | --- openjdk/jdk/make/sun/awt/mawt.gmk | ||
349 | +++ openjdk/jdk/make/sun/awt/mawt.gmk | ||
350 | @@ -196,8 +196,8 @@ endif | ||
351 | CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
352 | |||
353 | ifndef HEADLESS | ||
354 | -CPPFLAGS += -I$(OPENWIN_HOME)/include | ||
355 | -LDFLAGS += -L$(OPENWIN_LIB) | ||
356 | +#CPPFLAGS += -I$(OPENWIN_HOME)/include | ||
357 | +#LDFLAGS += -L$(OPENWIN_LIB) | ||
358 | |||
359 | endif # !HEADLESS | ||
360 | |||
361 | @@ -225,8 +225,8 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
362 | |||
363 | ifeq ($(PLATFORM), linux) | ||
364 | # Checking for the X11/extensions headers at the additional location | ||
365 | - CPPFLAGS += -I/X11R6/include/X11/extensions \ | ||
366 | - -I/usr/include/X11/extensions | ||
367 | +# CPPFLAGS += -I/X11R6/include/X11/extensions \ | ||
368 | +# -I/usr/include/X11/extensions | ||
369 | endif | ||
370 | |||
371 | ifeq ($(PLATFORM), solaris) | ||
372 | diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile | ||
373 | index 4b4c782..440699b 100644 | ||
374 | --- openjdk/jdk/make/sun/xawt/Makefile | ||
375 | +++ openjdk/jdk/make/sun/xawt/Makefile | ||
376 | @@ -129,11 +129,12 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \ | ||
377 | -I$(PLATFORM_SRC)/native/sun/awt | ||
378 | |||
379 | ifeq ($(PLATFORM), linux) | ||
380 | +# Very unsuitable for cross-compilation. | ||
381 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
382 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
383 | - -I/usr/include/X11/extensions \ | ||
384 | - -I$(MOTIF_DIR)/include \ | ||
385 | - -I$(OPENWIN_HOME)/include | ||
386 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
387 | +# -I/usr/include/X11/extensions \ | ||
388 | +# -I$(MOTIF_DIR)/include \ | ||
389 | +# -I$(OPENWIN_HOME)/include | ||
390 | endif | ||
391 | |||
392 | ifeq ($(PLATFORM), solaris) | ||
393 | @@ -250,7 +251,7 @@ $(SIZES): $(SIZERS) | ||
394 | $(CHMOD) +w $@;\ | ||
395 | else \ | ||
396 | $(ECHO) GENERATING $@; \ | ||
397 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
398 | + $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
399 | fi | ||
400 | @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
401 | $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
402 | diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile | ||
403 | index 6693e2a..494a646 100644 | ||
404 | --- openjdk/jdk/make/sun/splashscreen/Makefile | ||
405 | +++ openjdk/jdk/make/sun/splashscreen/Makefile | ||
406 | @@ -63,8 +63,8 @@ CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE | ||
407 | |||
408 | ifneq ($(PLATFORM), windows) | ||
409 | CFLAGS += -DWITH_X11 | ||
410 | - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
411 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
412 | + #CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
413 | + OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread | ||
414 | else # PLATFORM | ||
415 | CFLAGS += -DWITH_WIN32 | ||
416 | OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib | ||
417 | diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile | ||
418 | index 440699b..1fa311d 100644 | ||
419 | --- openjdk/jdk/make/sun/xawt/Makefile | ||
420 | +++ openjdk/jdk/make/sun/xawt/Makefile | ||
421 | @@ -46,7 +46,7 @@ include FILES_export_unix.gmk | ||
422 | AUTO_FILES_JAVA_DIRS = sun/awt/X11 | ||
423 | AUTO_JAVA_PRUNE = WrapperGenerator.java | ||
424 | |||
425 | -LDFLAGS += -L$(OPENWIN_LIB) | ||
426 | +#LDFLAGS += -L$(OPENWIN_LIB) | ||
427 | |||
428 | # For Xrender extension. | ||
429 | ifeq ($(PLATFORM), solaris) | ||
430 | diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher | ||
431 | index f59a9d6..6edc880 100644 | ||
432 | --- openjdk/jdk/make/launchers/Makefile.launcher | ||
433 | +++ openjdk/jdk/make/launchers/Makefile.launcher | ||
434 | @@ -152,7 +152,7 @@ endif | ||
435 | ifeq ($(GUI_TOOL),true) | ||
436 | ifneq ($(PLATFORM), windows) | ||
437 | # Anything with a GUI needs X11 to be linked in. | ||
438 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 | ||
439 | + OTHER_LDLIBS += -lX11 | ||
440 | endif | ||
441 | endif | ||
442 | |||
443 | diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile | ||
444 | index 2021434..9035da7 100644 | ||
445 | --- openjdk/jdk/make/sun/jawt/Makefile | ||
446 | +++ openjdk/jdk/make/sun/jawt/Makefile | ||
447 | @@ -98,8 +98,7 @@ else # PLATFORM | ||
448 | # | ||
449 | # Other extra flags needed for compiling. | ||
450 | # | ||
451 | -CPPFLAGS += -I$(OPENWIN_HOME)/include \ | ||
452 | - -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
453 | +CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
454 | -I$(SHARE_SRC)/native/$(PKGDIR)/image \ | ||
455 | -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \ | ||
456 | -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \ | ||
457 | diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile | ||
458 | index 1fa311d..f3d06ad 100644 | ||
459 | --- openjdk/jdk/make/sun/xawt/Makefile | ||
460 | +++ openjdk/jdk/make/sun/xawt/Makefile | ||
461 | @@ -232,7 +232,7 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt | ||
462 | |||
463 | $(SIZERS): $(SIZERS_C) | ||
464 | $(prep-target) | ||
465 | - $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c | ||
466 | + $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -static -fuse-ld=bfd -o $@ $(SIZER)$(suffix $@).c | ||
467 | |||
468 | $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA) | ||
469 | $(prep-target) | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch b/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch deleted file mode 100644 index 0d3ce04..0000000 --- a/recipes-core/openjdk/openjdk-6-6b27/icedtea-disable-sane-alsa.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | diff --git openjdk/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk | ||
2 | index 55c0e88..220aa5c 100644 | ||
3 | --- openjdk/jdk/make/common/shared/Sanity.gmk | ||
4 | +++ openjdk/jdk/make/common/shared/Sanity.gmk | ||
5 | @@ -102,11 +102,6 @@ ifeq ($(PLATFORM), linux) | ||
6 | if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \ | ||
7 | $(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \ | ||
8 | fi) | ||
9 | - ALSA_INCLUDE=/usr/include/alsa/version.h | ||
10 | - ALSA_LIBRARY=/usr/lib/libasound.so | ||
11 | - _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \ | ||
12 | - $(SED) -e 's@.*\"\(.*\)\".*@\1@' ) | ||
13 | - ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION)) | ||
14 | endif | ||
15 | |||
16 | ifeq ($(PLATFORM), windows) | ||
17 | @@ -210,7 +210,6 @@ endif | ||
18 | sane-compiler \ | ||
19 | sane-link \ | ||
20 | sane-cacerts \ | ||
21 | - sane-alsa-headers \ | ||
22 | sane-ant_version \ | ||
23 | sane-zip_version \ | ||
24 | sane-unzip_version \ | ||
25 | @@ -1351,9 +1346,6 @@ endif | ||
26 | # need /usr/include/alsa/version.h and /usr/lib/libasound.so | ||
27 | ###################################################### | ||
28 | |||
29 | -ifdef REQUIRED_ALSA_VERSION | ||
30 | - ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION)) | ||
31 | -endif | ||
32 | sane-alsa-headers: | ||
33 | ifdef REQUIRED_ALSA_VERSION | ||
34 | @if [ "$(ALSA_CHECK)" != "missing" ] ; then \ | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch b/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch deleted file mode 100644 index 93ca65d..0000000 --- a/recipes-core/openjdk/openjdk-6-6b32/build-hacks.patch +++ /dev/null | |||
@@ -1,119 +0,0 @@ | |||
1 | Index: icedtea6-1.13.3/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.13.3.orig/Makefile.am 2014-06-09 21:46:36.640603938 +0200 | ||
4 | +++ icedtea6-1.13.3/Makefile.am 2014-06-09 21:51:34.228435112 +0200 | ||
5 | @@ -795,6 +795,11 @@ | ||
6 | JAVAC="" \ | ||
7 | JAVA_HOME="" \ | ||
8 | JDK_HOME="" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | + OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \ | ||
14 | ANT_RESPECT_JAVA_HOME="TRUE" \ | ||
15 | DISTRIBUTION_ID="$(DIST_ID)" \ | ||
16 | DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ | ||
17 | @@ -2025,9 +2030,7 @@ | ||
18 | rm -f stamps/pax-mark-vm-debug.stamp | ||
19 | |||
20 | stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm.stamp | ||
21 | - if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ | ||
22 | - $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ | ||
23 | - fi | ||
24 | + $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ | ||
25 | mkdir -p stamps | ||
26 | touch $@ | ||
27 | |||
28 | @@ -2035,9 +2038,7 @@ | ||
29 | rm -f stamps/check-crypto.stamp | ||
30 | |||
31 | stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm-debug.stamp | ||
32 | - if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ | ||
33 | - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ | ||
34 | - fi | ||
35 | + $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ | ||
36 | mkdir -p stamps | ||
37 | touch $@ | ||
38 | |||
39 | @@ -2219,9 +2220,7 @@ | ||
40 | rm -f stamps/pax-mark-vm-ecj.stamp | ||
41 | |||
42 | stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/pax-mark-vm-ecj.stamp | ||
43 | - if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \ | ||
44 | - $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ | ||
45 | - fi | ||
46 | + $(BOOT_DIR)/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ | ||
47 | mkdir -p stamps | ||
48 | touch $@ | ||
49 | |||
50 | @@ -2379,10 +2378,14 @@ | ||
51 | if BUILD_JAMVM | ||
52 | cd jamvm/jamvm && \ | ||
53 | LDFLAGS="-Xlinker -z -Xlinker noexecstack" \ | ||
54 | - ./autogen.sh --with-java-runtime-library=openjdk6 \ | ||
55 | - --prefix=$(abs_top_builddir)/jamvm/install ; \ | ||
56 | - $(MAKE) ; \ | ||
57 | - $(MAKE) install | ||
58 | + $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk6 \ | ||
59 | + --prefix=$(abs_top_builddir)/jamvm/install \ | ||
60 | + --host=$(host_alias) \ | ||
61 | + --build=$(build_alias) \ | ||
62 | + --target=$(target_alias) \ | ||
63 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \ | ||
64 | + $(ARCH_PREFIX) $(MAKE) ; \ | ||
65 | + $(ARCH_PREFIX) $(MAKE) install | ||
66 | mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
67 | cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server | ||
68 | ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client | ||
69 | @@ -2446,6 +2449,7 @@ | ||
70 | --host=$(host_alias) \ | ||
71 | --build=$(build_alias) \ | ||
72 | --target=$(target_alias) \ | ||
73 | + --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \ | ||
74 | --prefix=$(abs_top_builddir)/cacao/install \ | ||
75 | --with-java-runtime-library=openjdk \ | ||
76 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ | ||
77 | @@ -2514,7 +2518,7 @@ | ||
78 | # configure script arguments, quoted in single quotes | ||
79 | CONFIGURE_ARGS = @CONFIGURE_ARGS@ | ||
80 | ADD_ZERO_CONFIGURE_ARGS = \ | ||
81 | - --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \ | ||
82 | + --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \ | ||
83 | --enable-zero | ||
84 | if ADD_SHARK_BUILD | ||
85 | ADD_ZERO_CONFIGURE_ARGS += \ | ||
86 | Index: icedtea6-1.13.3/javac.in | ||
87 | =================================================================== | ||
88 | --- icedtea6-1.13.3.orig/javac.in 2014-06-09 21:46:36.640603938 +0200 | ||
89 | +++ icedtea6-1.13.3/javac.in 2014-06-09 21:46:36.636603946 +0200 | ||
90 | @@ -40,7 +40,7 @@ | ||
91 | { | ||
92 | my @new_args = @{$_[0]}; | ||
93 | |||
94 | - for my $opt (NO_DUP_ARGS) | ||
95 | + for my $opt (NO_DUP_ARGS) | ||
96 | { | ||
97 | my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; | ||
98 | if (@indices > 1) { | ||
99 | @@ -49,7 +49,7 @@ | ||
100 | } | ||
101 | } | ||
102 | |||
103 | - for my $opt (STRIP_ARGS) | ||
104 | + for my $opt (STRIP_ARGS) | ||
105 | { | ||
106 | my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; | ||
107 | splice @new_args, $_, 1 for @indices; | ||
108 | @@ -91,7 +91,10 @@ | ||
109 | my @CLASSPATH = ('@ECJ_JAR@'); | ||
110 | push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; | ||
111 | $ENV{"CLASSPATH"} = join ':', @CLASSPATH; | ||
112 | - exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args; | ||
113 | + | ||
114 | + # Compiling hotspot-tools consumes tons of memory and exceeds any default | ||
115 | + # limits for jamvm and cacao. | ||
116 | + exec '@JAVA@', '-Xmx1024m', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args; | ||
117 | } | ||
118 | else | ||
119 | { | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch deleted file mode 100644 index 067b356..0000000 --- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-crosscompile-fix.patch +++ /dev/null | |||
@@ -1,280 +0,0 @@ | |||
1 | diff --git openjdk/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk | ||
2 | index f308203..5ba15dc 100644 | ||
3 | --- openjdk/corba/make/common/Defs-linux.gmk | ||
4 | +++ openjdk/corba/make/common/Defs-linux.gmk | ||
5 | @@ -82,9 +82,9 @@ CC_LOWER_OPT = -O2 | ||
6 | CC_NO_OPT = | ||
7 | |||
8 | ifeq ($(PRODUCT), java) | ||
9 | - _OPT = $(CC_HIGHER_OPT) | ||
10 | + _OPT = $(OE_CFLAGS) | ||
11 | else | ||
12 | - _OPT = $(CC_LOWER_OPT) | ||
13 | + _OPT = $(OE_CFLAGS) | ||
14 | CPPFLAGS_DBG += -DLOGGING | ||
15 | endif | ||
16 | |||
17 | @@ -94,7 +94,7 @@ endif | ||
18 | # as the default. | ||
19 | CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN | ||
20 | CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
21 | -CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN | ||
22 | +CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
23 | CFLAGS_REQUIRED_hppa += | ||
24 | CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
25 | CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
26 | @@ -221,7 +221,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) | ||
27 | # | ||
28 | # -L paths for finding and -ljava | ||
29 | # | ||
30 | -LDFLAGS_OPT = -Xlinker -O1 | ||
31 | +LDFLAGS_OPT = $(OE_LDFLAGS) | ||
32 | LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) | ||
33 | LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
34 | |||
35 | diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make | ||
36 | index 11de79a..c5751b2 100644 | ||
37 | --- openjdk/hotspot/make/linux/makefiles/gcc.make | ||
38 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make | ||
39 | @@ -140,7 +140,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) | ||
40 | CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) | ||
41 | |||
42 | # The flags to use for an Optimized g++ build | ||
43 | -OPT_CFLAGS += -O3 | ||
44 | +OPT_CFLAGS += $(OE_CFLAGS) | ||
45 | |||
46 | # Hotspot uses very unstrict aliasing turn this optimization off | ||
47 | OPT_CFLAGS += -fno-strict-aliasing | ||
48 | @@ -184,7 +184,7 @@ LFLAGS += -Wl,-relax | ||
49 | endif | ||
50 | |||
51 | # Enable linker optimization | ||
52 | -LFLAGS += -Xlinker -O1 | ||
53 | +LFLAGS += $(OE_LDFLAGS) | ||
54 | |||
55 | # If this is a --hash-style=gnu system, use --hash-style=both | ||
56 | # The gnu .hash section won't work on some Linux systems like SuSE 10. | ||
57 | diff --git openjdk/hotspot/make/linux/makefiles/jsig.make openjdk/hotspot/make/linux/makefiles/jsig.make | ||
58 | index 18f65d9..f12a798 100644 | ||
59 | --- openjdk/hotspot/make/linux/makefiles/jsig.make | ||
60 | +++ openjdk/hotspot/make/linux/makefiles/jsig.make | ||
61 | @@ -42,7 +42,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig | ||
62 | # cause problems with interposing. See CR: 6466665 | ||
63 | # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) | ||
64 | |||
65 | -LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) | ||
66 | +LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(OE_LDFLAGS) | ||
67 | |||
68 | # DEBUG_BINARIES overrides everything, use full -g debug information | ||
69 | ifeq ($(DEBUG_BINARIES), true) | ||
70 | diff --git openjdk/hotspot/make/linux/makefiles/launcher.make openjdk/hotspot/make/linux/makefiles/launcher.make | ||
71 | index c5cf503..ae7af2e 100644 | ||
72 | --- openjdk/hotspot/make/linux/makefiles/launcher.make | ||
73 | +++ openjdk/hotspot/make/linux/makefiles/launcher.make | ||
74 | @@ -50,7 +50,7 @@ ifeq ($(LINK_INTO),AOUT) | ||
75 | LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) | ||
76 | else | ||
77 | LAUNCHER.o = launcher.o | ||
78 | - LFLAGS_LAUNCHER += -L `pwd` | ||
79 | + LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS) | ||
80 | LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ | ||
81 | ifeq ($(SHARK_BUILD), true) | ||
82 | LFLAGS_LAUNCHER += $(LLVM_LDFLAGS) | ||
83 | diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk | ||
84 | index 4e31797..03a84dd 100644 | ||
85 | --- openjdk/jdk/make/common/Defs-linux.gmk | ||
86 | +++ openjdk/jdk/make/common/Defs-linux.gmk | ||
87 | @@ -89,9 +89,9 @@ HPIS = native | ||
88 | |||
89 | ifndef OPTIMIZATION_LEVEL | ||
90 | ifeq ($(PRODUCT), java) | ||
91 | - OPTIMIZATION_LEVEL = HIGHER | ||
92 | + OPTIMIZATION_LEVEL = $(OE_CFLAGS) | ||
93 | else | ||
94 | - OPTIMIZATION_LEVEL = LOWER | ||
95 | + OPTIMIZATION_LEVEL = $(OE_CFLAGS) | ||
96 | endif | ||
97 | endif | ||
98 | |||
99 | @@ -108,7 +108,7 @@ CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) | ||
100 | # as the default. | ||
101 | CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN | ||
102 | CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
103 | -CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN | ||
104 | +CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
105 | CFLAGS_REQUIRED_hppa += | ||
106 | CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
107 | CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
108 | @@ -249,7 +249,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) | ||
109 | # | ||
110 | # -L paths for finding and -ljava | ||
111 | # | ||
112 | -LDFLAGS_OPT = -Xlinker -O1 | ||
113 | +LDFLAGS_OPT = $(OE_LDFLAGS) | ||
114 | LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) | ||
115 | LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
116 | |||
117 | diff --git openjdk/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile | ||
118 | index e462fba..76b56be 100644 | ||
119 | --- openjdk/jdk/make/sun/awt/Makefile | ||
120 | +++ openjdk/jdk/make/sun/awt/Makefile | ||
121 | @@ -511,10 +511,10 @@ ifneq ($(PLATFORM), windows) | ||
122 | # | ||
123 | |||
124 | ifeq ($(PLATFORM), linux) | ||
125 | -CPPFLAGS += -I$(MOTIF_DIR)/include \ | ||
126 | - -I$(OPENWIN_HOME)/include \ | ||
127 | - -I$(OPENWIN_HOME)/include/X11/extensions \ | ||
128 | - -I$(PLATFORM_SRC)/native/$(PKGDIR)/font | ||
129 | +#CPPFLAGS += -I$(MOTIF_DIR)/include \ | ||
130 | +# -I$(OPENWIN_HOME)/include \ | ||
131 | +# -I$(OPENWIN_HOME)/include/X11/extensions \ | ||
132 | +CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font | ||
133 | endif | ||
134 | CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
135 | -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ | ||
136 | @@ -538,7 +538,7 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
137 | $(EVENT_MODEL) | ||
138 | |||
139 | ifeq ($(PLATFORM), linux) | ||
140 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
141 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
142 | endif | ||
143 | |||
144 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
145 | diff --git openjdk/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk | ||
146 | index 44de692..9ce661c 100644 | ||
147 | --- openjdk/jdk/make/sun/awt/mawt.gmk | ||
148 | +++ openjdk/jdk/make/sun/awt/mawt.gmk | ||
149 | @@ -196,8 +196,8 @@ endif | ||
150 | CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
151 | |||
152 | ifndef HEADLESS | ||
153 | -CPPFLAGS += -I$(OPENWIN_HOME)/include | ||
154 | -LDFLAGS += -L$(OPENWIN_LIB) | ||
155 | +#CPPFLAGS += -I$(OPENWIN_HOME)/include | ||
156 | +#LDFLAGS += -L$(OPENWIN_LIB) | ||
157 | |||
158 | endif # !HEADLESS | ||
159 | |||
160 | @@ -225,8 +225,8 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
161 | |||
162 | ifeq ($(PLATFORM), linux) | ||
163 | # Checking for the X11/extensions headers at the additional location | ||
164 | - CPPFLAGS += -I/X11R6/include/X11/extensions \ | ||
165 | - -I/usr/include/X11/extensions | ||
166 | +# CPPFLAGS += -I/X11R6/include/X11/extensions \ | ||
167 | +# -I/usr/include/X11/extensions | ||
168 | endif | ||
169 | |||
170 | ifeq ($(PLATFORM), solaris) | ||
171 | diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile | ||
172 | index 4b4c782..440699b 100644 | ||
173 | --- openjdk/jdk/make/sun/xawt/Makefile | ||
174 | +++ openjdk/jdk/make/sun/xawt/Makefile | ||
175 | @@ -129,11 +129,12 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \ | ||
176 | -I$(PLATFORM_SRC)/native/sun/awt | ||
177 | |||
178 | ifeq ($(PLATFORM), linux) | ||
179 | +# Very unsuitable for cross-compilation. | ||
180 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
181 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
182 | - -I/usr/include/X11/extensions \ | ||
183 | - -I$(MOTIF_DIR)/include \ | ||
184 | - -I$(OPENWIN_HOME)/include | ||
185 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
186 | +# -I/usr/include/X11/extensions \ | ||
187 | +# -I$(MOTIF_DIR)/include \ | ||
188 | +# -I$(OPENWIN_HOME)/include | ||
189 | endif | ||
190 | |||
191 | ifeq ($(PLATFORM), solaris) | ||
192 | @@ -250,7 +251,7 @@ $(SIZES): $(SIZERS) | ||
193 | $(CHMOD) +w $@;\ | ||
194 | else \ | ||
195 | $(ECHO) GENERATING $@; \ | ||
196 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
197 | + $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
198 | fi | ||
199 | @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
200 | $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
201 | diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile | ||
202 | index 440699b..1fa311d 100644 | ||
203 | --- openjdk/jdk/make/sun/xawt/Makefile | ||
204 | +++ openjdk/jdk/make/sun/xawt/Makefile | ||
205 | @@ -46,7 +46,7 @@ include FILES_export_unix.gmk | ||
206 | AUTO_FILES_JAVA_DIRS = sun/awt/X11 | ||
207 | AUTO_JAVA_PRUNE = WrapperGenerator.java | ||
208 | |||
209 | -LDFLAGS += -L$(OPENWIN_LIB) | ||
210 | +#LDFLAGS += -L$(OPENWIN_LIB) | ||
211 | |||
212 | # For Xrender extension. | ||
213 | ifeq ($(PLATFORM), solaris) | ||
214 | diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher | ||
215 | index f59a9d6..6edc880 100644 | ||
216 | --- openjdk/jdk/make/launchers/Makefile.launcher | ||
217 | +++ openjdk/jdk/make/launchers/Makefile.launcher | ||
218 | @@ -152,7 +152,7 @@ endif | ||
219 | ifeq ($(GUI_TOOL),true) | ||
220 | ifneq ($(PLATFORM), windows) | ||
221 | # Anything with a GUI needs X11 to be linked in. | ||
222 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 | ||
223 | + OTHER_LDLIBS += -lX11 | ||
224 | endif | ||
225 | endif | ||
226 | |||
227 | diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile | ||
228 | index 2021434..9035da7 100644 | ||
229 | --- openjdk/jdk/make/sun/jawt/Makefile | ||
230 | +++ openjdk/jdk/make/sun/jawt/Makefile | ||
231 | @@ -98,8 +98,7 @@ else # PLATFORM | ||
232 | # | ||
233 | # Other extra flags needed for compiling. | ||
234 | # | ||
235 | -CPPFLAGS += -I$(OPENWIN_HOME)/include \ | ||
236 | - -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
237 | +CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
238 | -I$(SHARE_SRC)/native/$(PKGDIR)/image \ | ||
239 | -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \ | ||
240 | -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \ | ||
241 | diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile | ||
242 | index 1fa311d..f3d06ad 100644 | ||
243 | --- openjdk/jdk/make/sun/xawt/Makefile | ||
244 | +++ openjdk/jdk/make/sun/xawt/Makefile | ||
245 | @@ -232,7 +232,7 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt | ||
246 | |||
247 | $(SIZERS): $(SIZERS_C) | ||
248 | $(prep-target) | ||
249 | - $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c | ||
250 | + $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -static -fuse-ld=bfd -o $@ $(SIZER)$(suffix $@).c | ||
251 | |||
252 | $(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA) | ||
253 | $(prep-target) | ||
254 | diff --git openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make | ||
255 | index 7271a9e..e441970 100644 | ||
256 | --- openjdk/hotspot/make/linux/makefiles/vm.make | ||
257 | +++ openjdk/hotspot/make/linux/makefiles/vm.make | ||
258 | @@ -290,6 +290,7 @@ ifeq ($(SHARK_BUILD), true) | ||
259 | LIBS_VM += $(LLVM_LIBS) | ||
260 | endif | ||
261 | |||
262 | +LFLAGS_VM += $(OE_LDFLAGS) | ||
263 | LINK_VM = $(LINK_LIB.CC) | ||
264 | |||
265 | # rule for building precompiled header | ||
266 | diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile | ||
267 | index d8d89aa..539854a 100644 | ||
268 | --- openjdk/jdk/make/sun/splashscreen/Makefile | ||
269 | +++ openjdk/jdk/make/sun/splashscreen/Makefile | ||
270 | @@ -66,8 +66,8 @@ endif | ||
271 | |||
272 | ifneq ($(PLATFORM), windows) | ||
273 | CFLAGS += -DWITH_X11 | ||
274 | - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
275 | - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread | ||
276 | + #CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions | ||
277 | + OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpthread | ||
278 | else # PLATFORM | ||
279 | CFLAGS += -DWITH_WIN32 | ||
280 | OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch deleted file mode 100644 index 917a5b8..0000000 --- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-disable-sane-alsa.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | diff --git openjdk/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk | ||
2 | index 88875b2..2ab8aaf 100644 | ||
3 | --- openjdk/jdk/make/common/shared/Sanity.gmk | ||
4 | +++ openjdk/jdk/make/common/shared/Sanity.gmk | ||
5 | @@ -31,6 +31,7 @@ | ||
6 | # Shared sanity rules for the JDK builds. | ||
7 | # | ||
8 | |||
9 | + | ||
10 | .SUFFIXES: .hdiffs | ||
11 | |||
12 | # All files created during sanity checking | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch deleted file mode 100644 index 3d7c619..0000000 --- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-hostbuildcc.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | diff --git openjdk/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make | ||
2 | index b40c081..2dfbfc8 100644 | ||
3 | --- openjdk/hotspot/make/linux/makefiles/rules.make | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/rules.make | ||
5 | @@ -36,6 +36,7 @@ DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@ | ||
6 | # variables: $(CFLAGS), $(CXXFLAGS) and $(CPPFLAGS). | ||
7 | CC_COMPILE = $(CC) $(CXXFLAGS) | ||
8 | CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS) | ||
9 | +CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS) | ||
10 | |||
11 | AS.S = $(AS) $(ASFLAGS) | ||
12 | |||
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch deleted file mode 100644 index 55f1f9c..0000000 --- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile | ||
2 | index eaf8a6e..4938613 100644 | ||
3 | --- openjdk/jdk/make/com/sun/jmx/Makefile | ||
4 | +++ openjdk/jdk/make/com/sun/jmx/Makefile | ||
5 | @@ -102,7 +102,7 @@ FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/ | ||
6 | # when available, we need to run with latest rmic version available. rmic | ||
7 | # launch tool not built at this stage but we can invoke via rmi class. | ||
8 | |||
9 | -RMIC_JAVA = $(OUTPUTDIR)/bin/java | ||
10 | +RMIC_JAVA = $(BOOTDIR)/bin/java | ||
11 | # need to treat 64bit solaris differently | ||
12 | ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) | ||
13 | RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch deleted file mode 100644 index 6dd36af..0000000 --- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-openjdk-remove-currency-data-generation-expi.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 7df2fd1014a0c31f518be4f6a0018533f469d584 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Gonzalez <alex.gonzalez@digi.com> | ||
3 | Date: Wed, 31 Dec 2014 16:07:32 +0100 | ||
4 | Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration | ||
5 | date | ||
6 | |||
7 | Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com> | ||
8 | --- | ||
9 | .../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 --- | ||
10 | 1 file changed, 3 deletions(-) | ||
11 | |||
12 | diff --git openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | ||
13 | index bf335fa22c1d..0e421360fef9 100644 | ||
14 | --- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | ||
15 | +++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java | ||
16 | @@ -281,9 +281,6 @@ public class GenerateCurrencyData { | ||
17 | checkCurrencyCode(newCurrency); | ||
18 | String timeString = currencyInfo.substring(4, length - 4); | ||
19 | long time = format.parse(timeString).getTime(); | ||
20 | - if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { | ||
21 | - throw new RuntimeException("time is more than 10 years from present: " + time); | ||
22 | - } | ||
23 | specialCaseCutOverTimes[specialCaseCount] = time; | ||
24 | specialCaseOldCurrencies[specialCaseCount] = oldCurrency; | ||
25 | specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency); | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch deleted file mode 100644 index cab80ac..0000000 --- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-remove_werror.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make | ||
2 | index 8986146..846bd6b 100644 | ||
3 | --- openjdk/hotspot/make/linux/makefiles/gcc.make | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make | ||
5 | @@ -132,11 +132,6 @@ else | ||
6 | CFLAGS += -pipe | ||
7 | endif | ||
8 | |||
9 | -# Compiler warnings are treated as errors | ||
10 | -ifneq ($(COMPILER_WARNINGS_FATAL),false) | ||
11 | -WARNINGS_ARE_ERRORS = -Werror | ||
12 | -endif | ||
13 | - | ||
14 | # Except for a few acceptable ones | ||
15 | # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit | ||
16 | # conversions which might affect the values. To avoid that, we need to turn | ||
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch deleted file mode 100644 index f14deaf..0000000 --- a/recipes-core/openjdk/openjdk-6-6b32/icedtea-zero-hotspotfix.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | diff --git openjdk/hotspot/make/linux/makefiles/zeroshark.make openjdk/hotspot/make/linux/makefiles/zeroshark.make | ||
2 | index c2a1484..f460d85 100644 | ||
3 | --- openjdk/hotspot/make/linux/makefiles/zeroshark.make | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/zeroshark.make | ||
5 | @@ -32,13 +32,20 @@ Obj_Files += cppInterpreter_arm.o | ||
6 | Obj_Files += thumb2.o | ||
7 | |||
8 | CFLAGS += -DHOTSPOT_ASM | ||
9 | +CCFLAGS += -DHOTSPOT_ASM | ||
10 | + | ||
11 | +ifeq ($(CROSS_COMPILATION), true) | ||
12 | + C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD) | ||
13 | +else | ||
14 | + C_COMPILE_FOR_MKBC = $(C_COMPILE) | ||
15 | +endif | ||
16 | |||
17 | cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s | ||
18 | thumb2.o: offsets_arm.s | ||
19 | |||
20 | offsets_arm.s: mkoffsets | ||
21 | @echo Generating assembler offsets | ||
22 | - ./mkoffsets > $@ | ||
23 | + $(QEMU) ./mkoffsets > $@ | ||
24 | |||
25 | bytecodes_arm.s: bytecodes_arm.def mkbc | ||
26 | @echo Generating ARM assembler bytecode sequences | ||
27 | @@ -46,12 +53,12 @@ bytecodes_arm.s: bytecodes_arm.def mkbc | ||
28 | |||
29 | mkbc: $(GAMMADIR)/tools/mkbc.c | ||
30 | @echo Compiling mkbc tool | ||
31 | - $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) | ||
32 | + $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE) | ||
33 | |||
34 | mkoffsets: asm_helper.cpp | ||
35 | @echo Compiling offset generator | ||
36 | $(QUIETLY) $(REMOVE_TARGET) | ||
37 | - $(CC_COMPILE) $(CFLAGS) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
38 | + $(CC_COMPILE) $(CFLAGS) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
39 | |||
40 | endif | ||
41 | |||
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc deleted file mode 100644 index cf192d0..0000000 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ /dev/null | |||
@@ -1,396 +0,0 @@ | |||
1 | require openjdk-common.inc | ||
2 | |||
3 | ICEDTEA = "icedtea6-${ICEDTEA_VERSION}" | ||
4 | |||
5 | INC_PR = "r22" | ||
6 | |||
7 | SRC_URI = "\ | ||
8 | ${ICEDTEA_URI} \ | ||
9 | ${OPENJDK_URI} \ | ||
10 | ${JAXWS_URI} \ | ||
11 | ${JAF_URI} \ | ||
12 | ${JAXP_URI} \ | ||
13 | ${CACAO_URI} \ | ||
14 | ${JAMVM_URI} \ | ||
15 | ${OEPATCHES} \ | ||
16 | ${ICEDTEAPATCHES} \ | ||
17 | file://jvm.cfg \ | ||
18 | " | ||
19 | |||
20 | JDKPN = "openjdk-6" | ||
21 | JDK_DIR = "java-6-openjdk" | ||
22 | |||
23 | PN = "${JDKPN}-jre" | ||
24 | PROVIDES += "${JDKPN} ${PACKAGES}" | ||
25 | |||
26 | DEPENDS = "giflib libpng jpeg cups \ | ||
27 | rhino \ | ||
28 | freetype libxinerama libxt libxrender libxtst libxi \ | ||
29 | alsa-lib libffi \ | ||
30 | ant-native \ | ||
31 | fastjar-native \ | ||
32 | icedtea6-native \ | ||
33 | zip-native \ | ||
34 | " | ||
35 | |||
36 | # No package should directly depend on this (it should require | ||
37 | # java2-runtime instead). | ||
38 | PRIVATE_LIBS = "\ | ||
39 | lib.so libunpack.so libverify.so libjava.so libzip.so libnpt.so \ | ||
40 | libjava_crw_demo.so libhprof.so libjavanet.so libnio.so \ | ||
41 | libmanagement.so libinstrument.so libjsound.so libjsoundalsa.so \ | ||
42 | libj2pcsc.so libj2pkcs11.so libj2gss.so libmlib_image.so \ | ||
43 | libawt.so libsplashscreen.so libfreetype.so.6 libfontmanager.so \ | ||
44 | libjpeg.so liblcms.so librmi.so libjawt.so libjaas_unix.so \ | ||
45 | libattach.so libjdwp.so libdt_socket.so libhpi.so libjli.so \ | ||
46 | libmawt.so libjvm.so \ | ||
47 | libversionCheck.so libcompiledMethodLoad.so libgctest.so \ | ||
48 | libheapViewer.so libheapTracker.so libminst.so libmtrace.so \ | ||
49 | libwaiters.so libhprof.so \ | ||
50 | " | ||
51 | |||
52 | |||
53 | export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}" | ||
54 | export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" | ||
55 | export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" | ||
56 | export CACAO_CONFIGURE_ARGS = "\ | ||
57 | ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']}" | ||
58 | |||
59 | JAVA_HOME[unexport] = "1" | ||
60 | |||
61 | EXTRA_OECONF = "\ | ||
62 | --disable-docs \ | ||
63 | --disable-pulse-java \ | ||
64 | \ | ||
65 | --with-ecj-jar=${STAGING_DATADIR_JAVA_NATIVE}/ecj-bootstrap.jar \ | ||
66 | --with-java=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/java \ | ||
67 | --with-javac=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javac \ | ||
68 | --with-javah=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/javah \ | ||
69 | --with-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/jar \ | ||
70 | --with-rmic=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/rmic \ | ||
71 | --with-native2ascii=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/native2ascii \ | ||
72 | --with-rhino=${STAGING_DATADIR_JAVA}/rhino.jar \ | ||
73 | --without-ant-home \ | ||
74 | --with-openjdk-src-dir=${WORKDIR}/openjdk-src-dir \ | ||
75 | --with-parallel-jobs=${JDK_JOBS} \ | ||
76 | \ | ||
77 | --with-pkgversion=${PV} \ | ||
78 | --with-cc-for-build=${BUILD_CC} \ | ||
79 | --enable-zero \ | ||
80 | --with-additional-vms=${WITH_ADDITIONAL_VMS} \ | ||
81 | --enable-openjdk-cross-compilation \ | ||
82 | " | ||
83 | |||
84 | |||
85 | # OpenJDK supports parallel compilation but uses a plain number for this. | ||
86 | # In OE we have PARALLEL_MAKE which is the actual option passed to make, | ||
87 | # e.g. "-j 4". | ||
88 | def get_jdk_jobs(d): | ||
89 | import bb | ||
90 | |||
91 | pm = bb.data.getVar('PARALLEL_MAKE', d, 1); | ||
92 | if not pm: | ||
93 | return "1" | ||
94 | |||
95 | pm = pm.split("j"); | ||
96 | if (len(pm) == 2): | ||
97 | return pm[1] | ||
98 | |||
99 | # Whatever found in PARALLEL_MAKE was not suitable. | ||
100 | return "1" | ||
101 | |||
102 | JDK_JOBS = "${@get_jdk_jobs(d)}" | ||
103 | |||
104 | # Custom preparation of the sources which: | ||
105 | # - cleans up the sources | ||
106 | # - copies the patches into the proper directory | ||
107 | # - prepares the FakeJDK directory structure | ||
108 | #DISABLED because of incompatibility with oe stable 2009: do_prepareconfigure () { | ||
109 | do_configure_prepend() { | ||
110 | chmod -R ug+w ${WORKDIR}/openjdk-src-dir | ||
111 | (cd ${WORKDIR}/openjdk-src-dir && sh ${S}/fsg.sh) | ||
112 | |||
113 | # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with | ||
114 | # ".patch" into the patches directory. | ||
115 | find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; | ||
116 | find ${WORKDIR} -maxdepth 1 -name "cacao*.patch" -exec cp {} ${S}/patches \; | ||
117 | |||
118 | # use now the rt.jar from icedtea6-native | ||
119 | mkdir -p ${WORKDIR}/fake-jdk/jre/lib | ||
120 | ln -sf ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/jre/lib/rt.jar ${WORKDIR}/fake-jdk/jre/lib/rt.jar | ||
121 | |||
122 | symlinked=false | ||
123 | bbnote "Creating symlinks for fake-jdk" | ||
124 | mkdir -p ${WORKDIR}/fake-jdk/include | ||
125 | for i in `find ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/include` ;do | ||
126 | bn=`basename $i` | ||
127 | echo "Symlinking: $bn" | ||
128 | ln -sf $i ${WORKDIR}/fake-jdk/include/$bn; | ||
129 | symlinked=true | ||
130 | done | ||
131 | |||
132 | # If the symlinks have not been created the built cannot continue. This | ||
133 | # can happen if icedtea6-native is not ready at this point. The recipe | ||
134 | # should make sure this is not the case but a little sanity checking | ||
135 | # in such a complicated build can't be wrong. | ||
136 | if [ x$symlinked = xfalse ] | ||
137 | then | ||
138 | bberror "Build b0rken! Have not created any symlinks for fake-jdk!" | ||
139 | else | ||
140 | bbnote "fake-jdk setup appears sane." | ||
141 | fi | ||
142 | } | ||
143 | |||
144 | # Note: The following lines only work for OE.dev branch but cause an exception | ||
145 | # in oe stable's 2009 bitbake. As such the function is prepended to do_configure instead. | ||
146 | #addtask prepareconfigure after do_patch before do_configure | ||
147 | # Makes prepareconfigure depend on icedtea6-native having being staged. | ||
148 | #do_prepareconfigure[depends] += "icedtea6-native:do_populate_sysroot" | ||
149 | |||
150 | |||
151 | do_configure_append() { | ||
152 | oe_runmake patch-ecj | ||
153 | } | ||
154 | |||
155 | # Work around broken variable quoting in oe-stable 2009 and provide the variable | ||
156 | # via the environment which then overrides the erroneous value that was written | ||
157 | # into '${ICETDEA}/Makefile'. | ||
158 | # Icedtea's makefile is not compatible to parallelization so we cannot allow | ||
159 | # passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are | ||
160 | # parallelizable and we need ${PARALLEL_MAKE} to derive the proper value. | ||
161 | # The base for this quirk is that GNU Make only considers the last "-j" option. | ||
162 | EXTRA_OEMAKE += '-j 1 CC="${CC}" CCC="${CXX}" CPP="${CPP}" CXX="${CXX}" CC_FOR_BUILD="${BUILD_CC}"' | ||
163 | |||
164 | EXTRA_OEMAKE += ' \ | ||
165 | OE_CFLAGS="${TARGET_CFLAGS}" \ | ||
166 | OE_CPPFLAGS="${TARGET_CPPFLAGS}" \ | ||
167 | OE_CXXFLAGS="${TARGET_CXXFLAGS}" \ | ||
168 | OE_LDFLAGS="${TARGET_LDFLAGS}" \ | ||
169 | ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \ | ||
170 | CROSS_COMPILE_ARCH="${JDK_ARCH}" \ | ||
171 | ' | ||
172 | |||
173 | OE_LAUNCHER_LDFLAGS = "-Wl,-rpath-link,${STAGING_LIBDIR}/llvm${WANT_LLVM_RELEASE} -Wl,-rpath,/usr/lib/llvm${WANT_LLVM_RELEASE}" | ||
174 | |||
175 | EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' | ||
176 | |||
177 | |||
178 | # The build of OpenJDK is a 3-part process. For better restartability and overrideability they have been split into | ||
179 | # three functions. | ||
180 | # 1. compile Hotspot or Cacao (this one is supposed to be implemented according to wanted VM) | ||
181 | # 2. compile openjdk-ecj (to have libraries as libjvm.so and libjava.so which are needed later) | ||
182 | # 3. compile openjdk (the final result) | ||
183 | |||
184 | do_compilestepone() { | ||
185 | oe_runmake bootstrap-directory-ecj | ||
186 | |||
187 | # now we need to override the tools.jar to point to the normal jdk's tools.jar | ||
188 | rm bootstrap/ecj/lib/tools.jar | ||
189 | ln -s ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/lib/tools.jar bootstrap/ecj/lib/tools.jar | ||
190 | |||
191 | # First build hotspot to get a libjvm.so (to link corba in the icedtea-ecj build) | ||
192 | bbnote "1/3 Building Hotspot" | ||
193 | oe_runmake hotspot | ||
194 | |||
195 | # Remove spurious libarch directory/symlink | ||
196 | rm -rf bootstrap/ecj/jre/lib/${JDK_ARCH} || true | ||
197 | |||
198 | # Provide a symlink to the target arch's libjvm.so (to link against) | ||
199 | ln -s `pwd`/${BUILD_DIR_ECJ}/j2sdk-image/jre/lib/${JDK_ARCH} bootstrap/jdk1.6.0/jre/lib/${JDK_ARCH} | ||
200 | |||
201 | # fake j2sdk-image | ||
202 | rm ${BUILD_DIR_ECJ}/j2sdk-image/include || true | ||
203 | cp -ar ${BUILD_DIR_ECJ}/hotspot/import/include ${BUILD_DIR_ECJ}/j2sdk-image/ | ||
204 | install -d ${BUILD_DIR_ECJ}/j2sdk-image/bin | ||
205 | } | ||
206 | addtask compilestepone after do_configure before do_compilesteptwo | ||
207 | |||
208 | # This part can be shared between cacao and hotspot-zero builds. | ||
209 | do_compilesteptwo() { | ||
210 | bbnote "2/3 Building bootstrap JDK" | ||
211 | |||
212 | # Now cross-compile bootstrap JDK | ||
213 | rm stamps/icedtea-against-ecj.stamp stamps/icedtea-ecj.stamp || true | ||
214 | oe_runmake icedtea-against-ecj | ||
215 | |||
216 | ln -sf ../${BUILD_DIR_ECJ}/j2sdk-image bootstrap/icedtea | ||
217 | |||
218 | # Replace all executables with symlinks to their native equivalents. | ||
219 | for F in `find ${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin -type f` | ||
220 | do | ||
221 | bf=`basename $F` | ||
222 | bbnote "Creating symlink for:" $bf | ||
223 | ln -sf $F bootstrap/icedtea/bin/$bf | ||
224 | done | ||
225 | } | ||
226 | addtask compilesteptwo after do_compilestepone before do_compile | ||
227 | |||
228 | do_compile() { | ||
229 | |||
230 | bbnote "3/3 Building final JDK" | ||
231 | |||
232 | # Build the final Hotspot + OpenJDK | ||
233 | oe_runmake icedtea-against-icedtea | ||
234 | } | ||
235 | |||
236 | do_install() { | ||
237 | install -d ${D}${libdir_jvm} | ||
238 | cp -R ${B}/${BUILD_DIR}/j2sdk-image ${D}${JDK_HOME} | ||
239 | |||
240 | chmod u+rw -R ${D}${JDK_HOME} | ||
241 | |||
242 | # Fix symlink which would point into staging in the binary package. | ||
243 | ln -sf ${datadir_java}/rhino.jar ${D}${JDK_HOME}/jre/lib/rhino.jar | ||
244 | |||
245 | # JRE is a subset of JDK. So to save space and resemble what the BIG distros | ||
246 | # do we create symlinks from the JDK binaries to their counterparts in the | ||
247 | # JRE folder (which have to exist by that time b/c of dependencies). | ||
248 | for F in `find ${D}${JDK_HOME}/jre/bin -type f` | ||
249 | do | ||
250 | bf=`basename $F` | ||
251 | bbnote "replace:" $bf | ||
252 | rm ${D}${JDK_HOME}/bin/$bf | ||
253 | ln -s ${JDK_HOME}/jre/bin/$bf ${D}${JDK_HOME}/bin/$bf | ||
254 | done | ||
255 | install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ | ||
256 | # workaround for shared libarary searching | ||
257 | ln -sf ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/libjvm.so ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ | ||
258 | } | ||
259 | |||
260 | # Notes about the ideas behind packaging: | ||
261 | # 1) User should install openjdk-6-jre. This is a provider of 'java2-runtime'. | ||
262 | # 2) This lets package mgmt install: openjdk-6-java | ||
263 | # -> openjdk-6-vm-shark|openjdk-6-vm-zero|openjdk-6-vm-cacao -> openjdk-6-common | ||
264 | # | ||
265 | # With opkg the zero VM is chosen which is good b/c that is the best known (= compatible) | ||
266 | # runtime. Installing other runtimes side-by-side is possible. Through jvm.cfg the following | ||
267 | # order of precedence is enforced: zero, shark, cacao. User can chose a different runtime | ||
268 | # by adding '-shark' or '-cacao' to the Java command (or by deinstalling an otherwise preferred | ||
269 | # runtime) | ||
270 | # 3) All other packages, including -jdk, are optional and not needed for normal Java apps. | ||
271 | PACKAGES = " \ | ||
272 | ${JDKPN}-jre \ | ||
273 | ${JDKPN}-dbg \ | ||
274 | ${JDKPN}-demo-dbg \ | ||
275 | ${JDKPN}-demo \ | ||
276 | ${JDKPN}-source \ | ||
277 | ${JDKPN}-doc \ | ||
278 | ${JDKPN}-jdk \ | ||
279 | ${JDKPN}-java \ | ||
280 | ${JDKPN}-vm-shark \ | ||
281 | ${JDKPN}-vm-zero \ | ||
282 | ${JDKPN}-vm-cacao \ | ||
283 | ${JDKPN}-vm-jamvm \ | ||
284 | ${JDKPN}-common \ | ||
285 | " | ||
286 | |||
287 | FILES_${JDKPN}-dbg = "\ | ||
288 | ${JDK_HOME}/bin/.debug \ | ||
289 | ${JDK_HOME}/lib/.debug \ | ||
290 | ${JDK_HOME}/jre/bin/.debug \ | ||
291 | ${JDK_HOME}/jre/lib/.debug \ | ||
292 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/.debug \ | ||
293 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \ | ||
294 | ${JDK_HOME}/lib/${JDK_ARCH}/jli/.debug \ | ||
295 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \ | ||
296 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \ | ||
297 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \ | ||
298 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/.debug \ | ||
299 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/.debug \ | ||
300 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \ | ||
301 | ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \ | ||
302 | /usr/src \ | ||
303 | " | ||
304 | |||
305 | FILES_${JDKPN}-demo = "${JDK_HOME}/demo ${JDK_HOME}/sample" | ||
306 | RDEPENDS_${JDKPN}-demo = "${JDKPN}-jre" | ||
307 | FILES_${JDKPN}-demo-dbg = "\ | ||
308 | ${JDK_HOME}/demo/jvmti/gctest/lib/.debug \ | ||
309 | ${JDK_HOME}/demo/jvmti/heapTracker/lib/.debug \ | ||
310 | ${JDK_HOME}/demo/jvmti/heapViewer/lib/.debug \ | ||
311 | ${JDK_HOME}/demo/jvmti/hprof/lib/.debug \ | ||
312 | ${JDK_HOME}/demo/jvmti/minst/lib/.debug \ | ||
313 | ${JDK_HOME}/demo/jvmti/mtrace/lib/.debug \ | ||
314 | ${JDK_HOME}/demo/jvmti/versionCheck/lib/.debug \ | ||
315 | ${JDK_HOME}/demo/jvmti/waiters/lib/.debug \ | ||
316 | ${JDK_HOME}/demo/jvmti/compiledMethodLoad/lib/.debug \ | ||
317 | " | ||
318 | |||
319 | FILES_${JDKPN}-source = "${JDK_HOME}/src.zip" | ||
320 | |||
321 | FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java" | ||
322 | |||
323 | FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/" | ||
324 | |||
325 | FILES_${JDKPN}-vm-shark = "${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/" | ||
326 | |||
327 | FILES_${JDKPN}-vm-cacao = "${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/" | ||
328 | |||
329 | FILES_${JDKPN}-vm-jamvm = "${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/" | ||
330 | |||
331 | FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ | ||
332 | ${JDK_HOME}/jre/THIRD_PARTY_README \ | ||
333 | ${JDK_HOME}/jre/LICENSE \ | ||
334 | ${JDK_HOME}/jre/lib \ | ||
335 | " | ||
336 | |||
337 | FILES_openjdk-6-jre_append = " \ | ||
338 | ${JDK_HOME}/jre/bin/keytool \ | ||
339 | ${JDK_HOME}/jre/bin/orbd \ | ||
340 | ${JDK_HOME}/jre/bin/pack200 \ | ||
341 | ${JDK_HOME}/jre/bin/rmid \ | ||
342 | ${JDK_HOME}/jre/bin/rmiregistry \ | ||
343 | ${JDK_HOME}/jre/bin/servertool \ | ||
344 | ${JDK_HOME}/jre/bin/tnameserv \ | ||
345 | ${JDK_HOME}/jre/bin/unpack200 \ | ||
346 | ${JDK_HOME}/jre/bin/policytool \ | ||
347 | ${JDK_HOME}/jre/bin/javaws \ | ||
348 | " | ||
349 | |||
350 | RDEPENDS_${JDKPN}-common = "librhino-java" | ||
351 | |||
352 | RPROVIDES_${JDKPN}-vm-shark = "java2-vm" | ||
353 | RPROVIDES_${JDKPN}-vm-zero = "java2-vm" | ||
354 | RPROVIDES_${JDKPN}-vm-cacao = "java2-vm" | ||
355 | RPROVIDES_${JDKPN}-vm-jamvm = "java2-vm" | ||
356 | |||
357 | # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled: | ||
358 | # root@beaglebone:~/java# opkg remove openjdk-6-vm-shark | ||
359 | # No packages removed. | ||
360 | # Collected errors: | ||
361 | # * print_dependents_warning: Package openjdk-6-vm-shark is depended upon by packages: | ||
362 | # * print_dependents_warning: openjdk-6-java | ||
363 | # * print_dependents_warning: These might cease to work if package openjdk-6-vm-shark is removed. | ||
364 | RRECOMMENDS_${JDKPN}-java = "java2-vm" | ||
365 | |||
366 | # For some reason shark and cacao do not automatically depends on -common. | ||
367 | # So we add that manually. | ||
368 | RDEPENDS_${JDKPN}-vm-shark = "${JDKPN}-common" | ||
369 | RDEPENDS_${JDKPN}-vm-cacao = "${JDKPN}-common" | ||
370 | RDEPENDS_${JDKPN}-vm-jamvm = "${JDKPN}-common" | ||
371 | |||
372 | # There is a symlink to a .so but this one is valid. | ||
373 | INSANE_SKIP_${JDKPN}-vm-shark = "dev-so" | ||
374 | INSANE_SKIP_${JDKPN}-vm-zero = "dev-so" | ||
375 | INSANE_SKIP_${JDKPN}-vm-cacao = "dev-so" | ||
376 | INSANE_SKIP_${JDKPN}-vm-jamvm = "dev-so" | ||
377 | INSANE_SKIP_${JDKPN}-common = "dev-so" | ||
378 | |||
379 | FILES_${JDKPN}-jdk = " \ | ||
380 | ${JDK_HOME}/bin \ | ||
381 | ${JDK_HOME}/lib \ | ||
382 | ${JDK_HOME}/include \ | ||
383 | ${JDK_HOME}/ASSEMBLY_EXCEPTION \ | ||
384 | ${JDK_HOME}/THIRD_PARTY_README \ | ||
385 | ${JDK_HOME}/LICENSE \ | ||
386 | " | ||
387 | RDEPENDS_${JDKPN}-jre = "${JDKPN}-java" | ||
388 | RPROVIDES_${JDKPN}-jre = "java2-runtime" | ||
389 | |||
390 | RDEPENDS_${JDKPN}-jdk = "${JDKPN}-jre" | ||
391 | |||
392 | FILES_${JDKPN}-doc = "${JDK_HOME}/man" | ||
393 | |||
394 | require openjdk-postinst.inc | ||
395 | |||
396 | ALTERNATIVE_PRIORITY = "20" | ||
diff --git a/recipes-core/openjdk/openjdk-6-release-6b24.inc b/recipes-core/openjdk/openjdk-6-release-6b24.inc deleted file mode 100644 index da5299f..0000000 --- a/recipes-core/openjdk/openjdk-6-release-6b24.inc +++ /dev/null | |||
@@ -1,149 +0,0 @@ | |||
1 | require openjdk-6-common.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
4 | |||
5 | FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b24:" | ||
6 | |||
7 | # needed for dis-asm.h | ||
8 | DEPENDS += "binutils" | ||
9 | |||
10 | EXTRA_OECONF += "\ | ||
11 | --with-jdk-home=${WORKDIR}/fake-jdk \ | ||
12 | --with-jar=${STAGING_LIBDIR_JVM_NATIVE}/icedtea6-native/bin/jar \ | ||
13 | --with-jaxws-drop-zip=${DL_DIR}/${JAXWS_FILE} \ | ||
14 | --with-jaf-drop-zip=${DL_DIR}/${JAF_FILE} \ | ||
15 | --with-jaxp-drop-zip=${DL_DIR}/${JAXP_FILE} \ | ||
16 | --with-cacao-src-zip=${DL_DIR}/${CACAO_VERSION}.tar.gz \ | ||
17 | --with-jamvm-src-zip=${DL_DIR}/jamvm-${JAMVM_VERSION}.tar.gz \ | ||
18 | --with-openjdk-src-zip=${DL_DIR}/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz \ | ||
19 | " | ||
20 | |||
21 | # List of additional JVM to include in the build, shark is disabled since 1.11.1 | ||
22 | WITH_ADDITIONAL_VMS = "cacao,jamvm" | ||
23 | |||
24 | # Name of the directory containing the compiled output | ||
25 | BUILD_DIR = "openjdk.build" | ||
26 | BUILD_DIR_ECJ = "openjdk.build-ecj" | ||
27 | |||
28 | # Force arm mode for now | ||
29 | ARM_INSTRUCTION_SET_armv4t = "ARM" | ||
30 | |||
31 | ICEDTEA_URI = "http://icedtea.wildebeest.org/download/source/${ICEDTEA}.tar.gz;name=iced" | ||
32 | |||
33 | OPENJDK_VERSION = "b24" | ||
34 | OPENJDK_DATE = "14_nov_2011" | ||
35 | OPENJDK_URI = "http://download.java.net/openjdk/jdk6/promoted/${OPENJDK_VERSION}/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz;subdir=openjdk-src-dir;name=openjdk;unpack=false" | ||
36 | SRC_URI[openjdk.md5sum] = "0eabdd360169144336e50081b8d01001" | ||
37 | SRC_URI[openjdk.sha256sum] = "f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227" | ||
38 | |||
39 | JAXWS_FILE = "jdk6-jaxws2_1_6-2011_06_13.zip" | ||
40 | JAXWS_URI = "http://icedtea.wildebeest.org/download/drops/${JAXWS_FILE};name=jaxws;unpack=false" | ||
41 | SRC_URI[jaxws.md5sum] = "8fd91b09b643a19a912b8a75e7a7a9d5" | ||
42 | SRC_URI[jaxws.sha256sum] = "229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3" | ||
43 | |||
44 | JAF_FILE = "jdk6-jaf-b20.zip" | ||
45 | JAF_URI = "http://icedtea.wildebeest.org/download/drops/${JAF_FILE};name=jaf;unpack=false" | ||
46 | SRC_URI[jaf.md5sum] = "bc95c133620bd68c161cac9891592901" | ||
47 | SRC_URI[jaf.sha256sum] = "78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012" | ||
48 | |||
49 | JAXP_FILE = "jaxp144_03.zip" | ||
50 | JAXP_URI = "http://icedtea.wildebeest.org/download/drops/${JAXP_FILE};name=jaxp;unpack=false" | ||
51 | SRC_URI[jaxp.md5sum] = "9eea471ad474040265c688858fcf09aa" | ||
52 | SRC_URI[jaxp.sha256sum] = "c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012" | ||
53 | |||
54 | CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_VERSION}.tar.gz;name=cacao;unpack=false" | ||
55 | CACAO_VERSION = "cff92704c4e0" | ||
56 | SRC_URI[cacao.md5sum] = "40b811b8b7f01b51cd21e62255691bc7" | ||
57 | SRC_URI[cacao.sha256sum] = "dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f" | ||
58 | |||
59 | JAMVM_URI = "http://icedtea.wildebeest.org/download/drops/jamvm/jamvm-${JAMVM_VERSION}.tar.gz;name=jamvm;unpack=false" | ||
60 | JAMVM_VERSION = "4617da717ecb05654ea5bb9572338061106a414d" | ||
61 | SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b" | ||
62 | SRC_URI[jamvm.sha256sum] = "47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d" | ||
63 | |||
64 | # Allow overriding this separately | ||
65 | OEPATCHES = "\ | ||
66 | file://build-hacks.patch \ | ||
67 | file://cacao-libtoolize.patch \ | ||
68 | file://cacao-loadavg-makefile.patch \ | ||
69 | file://fix_hotspot_crosscompile.patch \ | ||
70 | file://cacao-loadavg.patch;apply=no \ | ||
71 | file://cacao-arm-ucontext.patch;apply=no \ | ||
72 | " | ||
73 | |||
74 | # Allow overriding this separately | ||
75 | ICEDTEAPATCHES = "\ | ||
76 | file://icedtea-launcher-stdc++.patch;apply=no \ | ||
77 | file://icedtea-crosscompile-fix.patch;apply=no \ | ||
78 | file://icedtea-hostbuildcc.patch;apply=no \ | ||
79 | file://icedtea-unbreak-float.patch;apply=no \ | ||
80 | file://icedtea-remove_werror.patch;apply=no \ | ||
81 | file://icedtea-libnet-renaming.patch;apply=no \ | ||
82 | file://icedtea-fix-xrender.patch;apply=no \ | ||
83 | file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \ | ||
84 | file://icedtea-zero-hotspotfix.patch;apply=no \ | ||
85 | file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ | ||
86 | " | ||
87 | ICEDTEAPATCHES_append_e5500-64b = " \ | ||
88 | file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ | ||
89 | " | ||
90 | ICEDTEAPATCHES_append_e5500 = " \ | ||
91 | file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ | ||
92 | " | ||
93 | ICEDTEAPATCHES_append_e6500-64b = " \ | ||
94 | file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ | ||
95 | " | ||
96 | ICEDTEAPATCHES_append_e6500 = " \ | ||
97 | file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ | ||
98 | " | ||
99 | |||
100 | ICEDTEAPATCHES_append_libc-uclibc = " \ | ||
101 | file://icedtea-hotspot-isfinte.patch;apply=no \ | ||
102 | file://icedtea-hotspot-glibc-version.patch;apply=no \ | ||
103 | file://icedtea-hotspot-loadavg.patch;apply=no \ | ||
104 | file://icedtea-hotspot-isnanf.patch;apply=no \ | ||
105 | file://icedtea-jdk-iconv-uclibc.patch;apply=no \ | ||
106 | file://icedtea-jdk-remove-unused-backtrace.patch;apply=no \ | ||
107 | file://icedtea-jdk-unpack-uclibc.patch;apply=no \ | ||
108 | file://icedtea-hotspot-dlvsym-uclibc.patch;apply=no \ | ||
109 | " | ||
110 | |||
111 | # Allow overriding this separately | ||
112 | DISTRIBUTION_PATCHES = "\ | ||
113 | patches/icedtea-launcher-stdc++.patch \ | ||
114 | patches/icedtea-crosscompile-fix.patch \ | ||
115 | patches/icedtea-hostbuildcc.patch \ | ||
116 | patches/icedtea-unbreak-float.patch \ | ||
117 | patches/icedtea-remove_werror.patch \ | ||
118 | patches/icedtea-libnet-renaming.patch \ | ||
119 | patches/icedtea-fix-xrender.patch \ | ||
120 | patches/icedtea-shark-arm-linux-cpu-detection.patch \ | ||
121 | patches/icedtea-zero-hotspotfix.patch \ | ||
122 | patches/icedtea-jdk-powerpc-atomic64.patch \ | ||
123 | " | ||
124 | |||
125 | DISTRIBUTION_PATCHES_append_libc-uclibc = "\ | ||
126 | patches/icedtea-hotspot-isfinte.patch \ | ||
127 | patches/icedtea-hotspot-isnanf.patch \ | ||
128 | patches/icedtea-hotspot-glibc-version.patch \ | ||
129 | patches/icedtea-hotspot-loadavg.patch \ | ||
130 | patches/icedtea-jdk-iconv-uclibc.patch \ | ||
131 | patches/icedtea-jdk-remove-unused-backtrace.patch \ | ||
132 | patches/icedtea-jdk-unpack-uclibc.patch \ | ||
133 | patches/icedtea-hotspot-dlvsym-uclibc.patch \ | ||
134 | " | ||
135 | DISTRIBUTION_PATCHES_append_e5500-64b = " \ | ||
136 | patches/icedtea-jdk-sizers-crosscompile-hack.patch \ | ||
137 | " | ||
138 | |||
139 | DISTRIBUTION_PATCHES_append_e5500 = " \ | ||
140 | patches/icedtea-jdk-sizers-crosscompile-hack.patch \ | ||
141 | " | ||
142 | DISTRIBUTION_PATCHES_append_e6500-64b = " \ | ||
143 | patches/icedtea-jdk-sizers-crosscompile-hack.patch \ | ||
144 | " | ||
145 | |||
146 | DISTRIBUTION_PATCHES_append_e6500 = " \ | ||
147 | patches/icedtea-jdk-sizers-crosscompile-hack.patch \ | ||
148 | " | ||
149 | export DISTRIBUTION_PATCHES | ||
diff --git a/recipes-core/openjdk/openjdk-6-release-6b27.inc b/recipes-core/openjdk/openjdk-6-release-6b27.inc deleted file mode 100644 index eddb4e4..0000000 --- a/recipes-core/openjdk/openjdk-6-release-6b27.inc +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | require openjdk-6-release-6b24.inc | ||
2 | |||
3 | FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b27:" | ||
4 | |||
5 | EXTRA_OECONF += "--disable-downloading" | ||
6 | |||
7 | OPENJDK_VERSION = "b27" | ||
8 | OPENJDK_DATE = "26_oct_2012" | ||
9 | SRC_URI[openjdk.md5sum] = "3a0963158e07c8829c8bd31a698bd23d" | ||
10 | SRC_URI[openjdk.sha256sum] = "044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0" | ||
11 | |||
12 | CACAO_VERSION = "68fe50ac34ec" | ||
13 | SRC_URI[cacao.md5sum] = "d7607c455d36ba69651dfea38546922c" | ||
14 | SRC_URI[cacao.sha256sum] = "b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a" | ||
15 | |||
16 | JAMVM_VERSION = "0972452d441544f7dd29c55d64f1ce3a5db90d82" | ||
17 | SRC_URI[jamvm.md5sum] = "f4616713ec609e35aa8070811bd952aa" | ||
18 | SRC_URI[jamvm.sha256sum] = "bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03" | ||
19 | |||
20 | JAXP_FILE = "jaxp144_04.zip" | ||
21 | SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd" | ||
22 | SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c" | ||
23 | |||
24 | |||
25 | ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no \ | ||
26 | file://icedtea-disable-sane-alsa.patch;apply=no \ | ||
27 | " | ||
28 | |||
29 | DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch \ | ||
30 | patches/icedtea-disable-sane-alsa.patch \ | ||
31 | " | ||
diff --git a/recipes-core/openjdk/openjdk-6-release-6b32.inc b/recipes-core/openjdk/openjdk-6-release-6b32.inc deleted file mode 100644 index c1badcb..0000000 --- a/recipes-core/openjdk/openjdk-6-release-6b32.inc +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | require openjdk-6-release-6b27.inc | ||
2 | |||
3 | DEPENDS += "krb5 libxslt-native" | ||
4 | |||
5 | FILESPATH =. "${FILE_DIRNAME}/openjdk-6-6b32:" | ||
6 | |||
7 | ICEDTEAPATCHES += "file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no" | ||
8 | |||
9 | EXTRA_OECONF += "--disable-downloading \ | ||
10 | --enable-system-zlib \ | ||
11 | --enable-system-jpeg \ | ||
12 | --enable-system-png \ | ||
13 | --enable-system-gif \ | ||
14 | --disable-system-lcms \ | ||
15 | " | ||
16 | do_configure_append () { | ||
17 | patch -p0 <${WORKDIR}/icedtea-openjdk-remove-currency-data-generation-expi.patch | ||
18 | cd openjdk-ecj | ||
19 | patch -p1 <${WORKDIR}/icedtea-openjdk-remove-currency-data-generation-expi.patch | ||
20 | cd .. | ||
21 | } | ||
22 | |||
23 | OPENJDK_VERSION = "b32" | ||
24 | OPENJDK_DATE = "15_jul_2014" | ||
25 | #https://java.net/projects/openjdk6/downloads/download/openjdk-6-src-b31-15_apr_2014.tar.gz | ||
26 | OPENJDK_URI = "https://java.net/projects/openjdk6/downloads/download/openjdk-6-src-${OPENJDK_VERSION}-${OPENJDK_DATE}.tar.gz;subdir=openjdk-src-dir;name=openjdk;unpack=false" | ||
27 | SRC_URI[openjdk.md5sum] = "a97c28256a61be76e3047c31e0349c04" | ||
28 | SRC_URI[openjdk.sha256sum] = "fe1eb7053fddfd325152f95f9719325e4ba67534a26fa690ca24fab75461a1fa" | ||
29 | |||
30 | JAMVM_VERSION = "ec18fb9e49e62dce16c5094ef1527eed619463aa" | ||
31 | SRC_URI[jamvm.md5sum] = "d50ae193d01a9251e10679c7a2cc6ff1" | ||
32 | SRC_URI[jamvm.sha256sum] = "31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc" | ||
33 | |||
34 | JAXP_FILE = "jaxp144_04.zip" | ||
35 | SRC_URI[jaxp.md5sum] = "0ace787aa12177d201947e8ba0ba9bdd" | ||
36 | SRC_URI[jaxp.sha256sum] = "490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c" | ||
diff --git a/recipes-core/openjdk/openjdk-6/build-hacks.patch b/recipes-core/openjdk/openjdk-6/build-hacks.patch deleted file mode 100644 index 02a8300..0000000 --- a/recipes-core/openjdk/openjdk-6/build-hacks.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Index: icedtea6-1.8/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/Makefile.am 2010-04-12 23:55:51.754838172 +0200 | ||
4 | +++ icedtea6-1.8/Makefile.am 2010-06-16 15:17:10.224708601 +0200 | ||
5 | @@ -477,6 +477,11 @@ | ||
6 | JAVAC="" \ | ||
7 | JAVA_HOME="" \ | ||
8 | JDK_HOME="" \ | ||
9 | + OE_CFLAGS="$(OE_CFLAGS)" \ | ||
10 | + OE_CPPFLAGS="$(OE_CPPFLAGS)" \ | ||
11 | + OE_CXXFLAGS="$(OE_CXXFLAGS)" \ | ||
12 | + OE_LDFLAGS="$(OE_LDFLAGS)" \ | ||
13 | + OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \ | ||
14 | DISTRIBUTION_ID="$(DIST_ID)" \ | ||
15 | DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ | ||
16 | DEBUG_CLASSFILES="true" \ | ||
17 | Index: icedtea6-1.8/javac.in | ||
18 | =================================================================== | ||
19 | --- icedtea6-1.8.orig/javac.in 2010-03-25 15:10:41.714835519 +0100 | ||
20 | +++ icedtea6-1.8/javac.in 2010-06-16 15:14:31.205334756 +0200 | ||
21 | @@ -35,7 +35,9 @@ | ||
22 | elif [ ! -z "@ECJ@" ] ; then | ||
23 | @ECJ@ -1.5 -nowarn $bcoption $NEW_ARGS | ||
24 | else | ||
25 | + # Compiling hotspot-tools consumes tons of memory and exceeds any default | ||
26 | + # limits for jamvm and cacao. | ||
27 | CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \ | ||
28 | - @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS | ||
29 | + @JAVA@ -Xmx1024m org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS | ||
30 | fi | ||
31 | |||
diff --git a/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch b/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch deleted file mode 100644 index d676142..0000000 --- a/recipes-core/openjdk/openjdk-6/cacao-disable-stackbase-check.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: cacao/cacao/src/mm/boehm-gc/os_dep.c | ||
2 | =================================================================== | ||
3 | --- cacao/cacao/src/mm/boehm-gc/os_dep.c 2009-02-15 16:29:15.000000000 +0100 | ||
4 | +++ cacao/cacao/src/mm/boehm-gc/os_dep.c 2009-02-15 16:29:24.000000000 +0100 | ||
5 | @@ -1077,7 +1077,6 @@ | ||
6 | c = stat_buf[buf_offset++]; | ||
7 | } | ||
8 | close(f); | ||
9 | - if (result < 0x10000000) ABORT("Absurd stack bottom value"); | ||
10 | return (ptr_t)result; | ||
11 | } | ||
12 | |||
diff --git a/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch b/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch deleted file mode 100644 index a153a32..0000000 --- a/recipes-core/openjdk/openjdk-6/cacao-libtoolize.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Index: icedtea6-1.8.5/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.5.orig/Makefile.am 2011-02-04 18:29:58.826701224 +0100 | ||
4 | +++ icedtea6-1.8.5/Makefile.am 2011-02-04 18:31:53.430016002 +0100 | ||
5 | @@ -1918,10 +1918,13 @@ | ||
6 | if BUILD_CACAO | ||
7 | if !USE_SYSTEM_CACAO | ||
8 | cd cacao/cacao && \ | ||
9 | + rm -f libtool && \ | ||
10 | + autoreconf --verbose --install --force --no-recursive && \ | ||
11 | $(ARCH_PREFIX) ./configure \ | ||
12 | --host=$(host_alias) \ | ||
13 | --build=$(build_alias) \ | ||
14 | --target=$(target_alias) \ | ||
15 | + --with-libtool-sysroot \ | ||
16 | --prefix=$(abs_top_builddir)/cacao/install \ | ||
17 | --with-java-runtime-library=openjdk \ | ||
18 | --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ | ||
diff --git a/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch b/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch deleted file mode 100644 index 09ba984..0000000 --- a/recipes-core/openjdk/openjdk-6/cacao-vfp-compat.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Index: cacao/cacao/src/vm/jit/arm/codegen.c | ||
2 | =================================================================== | ||
3 | --- cacao/cacao/src/vm/jit/arm/codegen.c 2008-10-01 16:23:21.439856241 +0200 | ||
4 | +++ cacao/cacao/src/vm/jit/arm/codegen.c 2008-10-01 16:41:24.278841537 +0200 | ||
5 | @@ -2353,10 +2353,12 @@ | ||
6 | |||
7 | d = md->returntype.type; | ||
8 | |||
9 | -#if !defined(__SOFTFP__) | ||
10 | +#if !defined(__SOFTFP__) && !defined(__VFP_FP__) | ||
11 | /* TODO: this is only a hack, since we use R0/R1 for float | ||
12 | return! this depends on gcc; it is independent from | ||
13 | - our ENABLE_SOFTFLOAT define */ | ||
14 | + our ENABLE_SOFTFLOAT define | ||
15 | + It is only needed for -mfpu=fpa -mfloat-abi=hard! | ||
16 | + */ | ||
17 | if (iptr->opc == ICMD_BUILTIN && d != TYPE_VOID && IS_FLT_DBL_TYPE(d)) { | ||
18 | #if 0 && !defined(NDEBUG) | ||
19 | dolog("BUILTIN that returns float or double (%s.%s)", m->clazz->name->text, m->name->text); | ||
20 | @@ -3019,7 +3021,7 @@ | ||
21 | s1 = (s4) (cd->mcodeptr - cd->mcodebase); | ||
22 | M_RECOMPUTE_PV(s1); | ||
23 | |||
24 | -#if !defined(__SOFTFP__) | ||
25 | +#if !defined(__SOFTFP__) && !defined(__VFP_FP__) | ||
26 | /* TODO: this is only a hack, since we use R0/R1 for float return! */ | ||
27 | /* this depends on gcc; it is independent from our ENABLE_SOFTFLOAT define */ | ||
28 | if (md->returntype.type != TYPE_VOID && IS_FLT_DBL_TYPE(md->returntype.type)) { | ||
29 | @@ -3030,7 +3032,7 @@ | ||
30 | /* M_CAST_FLT_TO_INT_TYPED(md->returntype.type, REG_FRESULT, REG_RESULT_TYPED(md->returntype.type)); */ | ||
31 | if (IS_2_WORD_TYPE(md->returntype.type)) { | ||
32 | DCD(0xed2d8102); /* stfd f0, [sp, #-8]! */ | ||
33 | - M_LDRD_UPDATE(REG_RESULT_PACKED, REG_SP, 8); | ||
34 | + M_LDRD_UPDATE(REG_RESULT_PACKED, REG_SP, 8); | ||
35 | } else { | ||
36 | DCD(0xed2d0101); /* stfs f0, [sp, #-4]!*/ | ||
37 | M_LDR_UPDATE(REG_RESULT, REG_SP, 4); | ||
diff --git a/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch b/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch deleted file mode 100644 index 7c82daf..0000000 --- a/recipes-core/openjdk/openjdk-6/fix-llvm-libs.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: icedtea6-1.8/configure.ac | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/configure.ac | ||
4 | +++ icedtea6-1.8/configure.ac | ||
5 | @@ -472,7 +472,7 @@ | ||
6 | if test "x$LLVM_SHARED_LIB" != x && echo "$flag" | grep -q '^-lLLVM'; then | ||
7 | continue | ||
8 | fi | ||
9 | - if echo "$flag" | grep -q '^-l'; then | ||
10 | + if echo "$flag" | grep -q '^-l\|.so'; then | ||
11 | if test "x$LLVM_LIBS" != "x"; then | ||
12 | LLVM_LIBS="$LLVM_LIBS " | ||
13 | fi | ||
diff --git a/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch b/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch deleted file mode 100644 index 3d4a68c..0000000 --- a/recipes-core/openjdk/openjdk-6/fix_hotspot_crosscompile.patch +++ /dev/null | |||
@@ -1,94 +0,0 @@ | |||
1 | Index: icedtea6-1.8/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/Makefile.am 2010-06-18 12:31:34.534667003 +0200 | ||
4 | +++ icedtea6-1.8/Makefile.am 2010-06-18 12:31:34.714667729 +0200 | ||
5 | @@ -488,6 +488,7 @@ | ||
6 | DEBUG_BINARIES="true" \ | ||
7 | ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ | ||
8 | VERBOSE="$(VERBOSE)" \ | ||
9 | + CC_FOR_BUILD="$(CC_FOR_BUILD)" \ | ||
10 | ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ | ||
11 | ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" | ||
12 | |||
13 | Index: icedtea6-1.8/acinclude.m4 | ||
14 | =================================================================== | ||
15 | --- icedtea6-1.8.orig/acinclude.m4 2010-04-10 21:58:40.804836529 +0200 | ||
16 | +++ icedtea6-1.8/acinclude.m4 2010-06-18 12:31:34.714667729 +0200 | ||
17 | @@ -900,6 +900,21 @@ | ||
18 | AC_SUBST(ALT_CACAO_SRC_DIR) | ||
19 | ]) | ||
20 | |||
21 | +AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD], | ||
22 | +[ | ||
23 | + AC_MSG_CHECKING(for compiler used for subsidiary programs) | ||
24 | + AC_ARG_WITH([cc-for-build], | ||
25 | + [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)], | ||
26 | + [ | ||
27 | + CC_FOR_BUILD="${withval}" | ||
28 | + ], | ||
29 | + [ | ||
30 | + CC_FOR_BUILD="\$(CC)" | ||
31 | + ]) | ||
32 | + AC_MSG_RESULT(${CC_FOR_BUILD}) | ||
33 | + AC_SUBST(CC_FOR_BUILD) | ||
34 | +]) | ||
35 | + | ||
36 | AC_DEFUN([AC_CHECK_WITH_GCJ], | ||
37 | [ | ||
38 | AC_MSG_CHECKING([whether to compile ecj natively]) | ||
39 | Index: icedtea6-1.8/configure.ac | ||
40 | =================================================================== | ||
41 | --- icedtea6-1.8.orig/configure.ac 2010-04-12 13:46:18.821086023 +0200 | ||
42 | +++ icedtea6-1.8/configure.ac 2010-06-18 12:31:34.724666321 +0200 | ||
43 | @@ -44,6 +44,7 @@ | ||
44 | IT_CHECK_FOR_MERCURIAL | ||
45 | IT_OBTAIN_HG_REVISIONS | ||
46 | AC_PATH_TOOL([LSB_RELEASE],[lsb_release]) | ||
47 | +AC_CHECK_WITH_CC_FOR_BUILD | ||
48 | AC_CHECK_WITH_GCJ | ||
49 | AC_CHECK_WITH_HOTSPOT_BUILD | ||
50 | AC_PATH_TOOL([LINUX32],[linux32]) | ||
51 | Index: icedtea6-1.8/ports/hotspot/make/linux/makefiles/zeroshark.make | ||
52 | =================================================================== | ||
53 | --- icedtea6-1.8.orig/ports/hotspot/make/linux/makefiles/zeroshark.make 2010-03-25 15:10:42.061085966 +0100 | ||
54 | +++ icedtea6-1.8/ports/hotspot/make/linux/makefiles/zeroshark.make 2010-06-18 12:40:42.834666505 +0200 | ||
55 | @@ -32,6 +32,13 @@ | ||
56 | Obj_Files += thumb2.o | ||
57 | |||
58 | CFLAGS += -DHOTSPOT_ASM | ||
59 | +CCFLAGS += -DHOTSPOT_ASM | ||
60 | + | ||
61 | +ifeq ($(CROSS_COMPILATION), true) | ||
62 | + C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD) | ||
63 | +else | ||
64 | + C_COMPILE_FOR_MKBC = $(C_COMPILE) | ||
65 | +endif | ||
66 | |||
67 | %.o: %.S | ||
68 | @echo Assembling $< | ||
69 | @@ -43,20 +50,20 @@ | ||
70 | |||
71 | offsets_arm.s: mkoffsets | ||
72 | @echo Generating assembler offsets | ||
73 | - ./mkoffsets > $@ | ||
74 | + $(QEMU) ./mkoffsets > $@ | ||
75 | |||
76 | bytecodes_arm.s: bytecodes_arm.def mkbc | ||
77 | @echo Generatine ARM assembler bytecode sequences | ||
78 | $(CC_COMPILE) -E -x c++ - < $< | ./mkbc - $@ $(COMPILE_DONE) | ||
79 | |||
80 | -mkbc: $(GAMMADIR)/tools/mkbc.c | ||
81 | +mkbc: $(GAMMADIR)/tools/mkbc.c | ||
82 | @echo Compiling mkbc tool | ||
83 | - $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) | ||
84 | + $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE) | ||
85 | |||
86 | -mkoffsets: asm_helper.cpp | ||
87 | +mkoffsets: asm_helper.cpp | ||
88 | @echo Compiling offset generator | ||
89 | $(QUIETLY) $(REMOVE_TARGET) | ||
90 | - $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
91 | + $(CC_COMPILE) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) | ||
92 | |||
93 | endif | ||
94 | |||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch deleted file mode 100644 index 6ec83bb..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-crosscompile-fix.patch +++ /dev/null | |||
@@ -1,229 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/sun/awt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/make/sun/awt/Makefile 2009-01-24 17:54:57.000000000 +0100 | ||
4 | +++ openjdk/jdk/make/sun/awt/Makefile 2009-01-24 17:55:07.000000000 +0100 | ||
5 | @@ -509,10 +509,10 @@ | ||
6 | # | ||
7 | |||
8 | ifeq ($(PLATFORM), linux) | ||
9 | -CPPFLAGS += -I$(MOTIF_DIR)/include \ | ||
10 | - -I$(OPENWIN_HOME)/include \ | ||
11 | - -I$(OPENWIN_HOME)/include/X11/extensions \ | ||
12 | - -I$(PLATFORM_SRC)/native/$(PKGDIR)/font | ||
13 | +#CPPFLAGS += -I$(MOTIF_DIR)/include \ | ||
14 | +# -I$(OPENWIN_HOME)/include \ | ||
15 | +# -I$(OPENWIN_HOME)/include/X11/extensions \ | ||
16 | +CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font | ||
17 | endif | ||
18 | CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ | ||
19 | -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ | ||
20 | @@ -536,7 +536,7 @@ | ||
21 | $(EVENT_MODEL) | ||
22 | |||
23 | ifeq ($(PLATFORM), linux) | ||
24 | -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
25 | +#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) | ||
26 | endif | ||
27 | |||
28 | LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ | ||
29 | Index: openjdk/jdk/make/sun/awt/mawt.gmk | ||
30 | =================================================================== | ||
31 | --- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:54:57.000000000 +0100 | ||
32 | +++ openjdk/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:55:07.000000000 +0100 | ||
33 | @@ -194,8 +194,8 @@ | ||
34 | CPPFLAGS += -I$(CUPS_HEADERS_PATH) | ||
35 | |||
36 | ifndef HEADLESS | ||
37 | -CPPFLAGS += -I$(OPENWIN_HOME)/include | ||
38 | -LDFLAGS += -L$(OPENWIN_LIB) | ||
39 | +#CPPFLAGS += -I$(OPENWIN_HOME)/include | ||
40 | +#LDFLAGS += -L$(OPENWIN_LIB) | ||
41 | |||
42 | endif # !HEADLESS | ||
43 | |||
44 | @@ -223,8 +223,8 @@ | ||
45 | |||
46 | ifeq ($(PLATFORM), linux) | ||
47 | # Checking for the X11/extensions headers at the additional location | ||
48 | - CPPFLAGS += -I/X11R6/include/X11/extensions \ | ||
49 | - -I/usr/include/X11/extensions | ||
50 | +# CPPFLAGS += -I/X11R6/include/X11/extensions \ | ||
51 | +# -I/usr/include/X11/extensions | ||
52 | endif | ||
53 | |||
54 | ifeq ($(PLATFORM), solaris) | ||
55 | Index: openjdk/jdk/make/sun/xawt/Makefile | ||
56 | =================================================================== | ||
57 | --- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-01-24 17:54:57.000000000 +0100 | ||
58 | +++ openjdk/jdk/make/sun/xawt/Makefile 2009-01-24 17:55:07.000000000 +0100 | ||
59 | @@ -123,11 +123,12 @@ | ||
60 | -I$(PLATFORM_SRC)/native/sun/awt | ||
61 | |||
62 | ifeq ($(PLATFORM), linux) | ||
63 | +# Very unsuitable for cross-compilation. | ||
64 | # Allows for builds on Debian GNU Linux, X11 is in a different place | ||
65 | - CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
66 | - -I/usr/include/X11/extensions \ | ||
67 | - -I$(MOTIF_DIR)/include \ | ||
68 | - -I$(OPENWIN_HOME)/include | ||
69 | +# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ | ||
70 | +# -I/usr/include/X11/extensions \ | ||
71 | +# -I$(MOTIF_DIR)/include \ | ||
72 | +# -I$(OPENWIN_HOME)/include | ||
73 | endif | ||
74 | |||
75 | ifeq ($(PLATFORM), solaris) | ||
76 | Index: openjdk/hotspot/make/linux/makefiles/vm.make | ||
77 | =================================================================== | ||
78 | --- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:54:57.000000000 +0100 | ||
79 | +++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:55:07.000000000 +0100 | ||
80 | @@ -170,6 +170,7 @@ | ||
81 | LIBS_VM += $(LLVM_LIBS) | ||
82 | endif | ||
83 | |||
84 | +LFLAGS_VM += $(OE_LDFLAGS) | ||
85 | LINK_VM = $(LINK_LIB.c) | ||
86 | |||
87 | # rule for building precompiled header | ||
88 | Index: openjdk/hotspot/make/linux/makefiles/buildtree.make | ||
89 | =================================================================== | ||
90 | --- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:54:57.000000000 +0100 | ||
91 | +++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:55:07.000000000 +0100 | ||
92 | @@ -343,7 +343,7 @@ | ||
93 | echo "rm -f Queens.class"; \ | ||
94 | echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ | ||
95 | echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ | ||
96 | - echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ | ||
97 | + echo 'echo Silently skipping the execution of the gamma program'; \ | ||
98 | ) > $@ | ||
99 | $(QUIETLY) chmod +x $@ | ||
100 | |||
101 | Index: openjdk/corba/make/common/Defs-linux.gmk | ||
102 | =================================================================== | ||
103 | --- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100 | ||
104 | +++ openjdk/corba/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100 | ||
105 | @@ -82,9 +82,9 @@ | ||
106 | CC_NO_OPT = | ||
107 | |||
108 | ifeq ($(PRODUCT), java) | ||
109 | - _OPT = $(CC_HIGHER_OPT) | ||
110 | + _OPT = $(OE_CFLAGS) | ||
111 | else | ||
112 | - _OPT = $(CC_LOWER_OPT) | ||
113 | + _OPT = $(OE_CFLAGS) | ||
114 | CPPFLAGS_DBG += -DLOGGING | ||
115 | endif | ||
116 | |||
117 | @@ -94,7 +94,7 @@ | ||
118 | # as the default. | ||
119 | CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN | ||
120 | CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
121 | -CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN | ||
122 | +CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
123 | CFLAGS_REQUIRED_hppa += | ||
124 | CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
125 | CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
126 | @@ -221,7 +221,7 @@ | ||
127 | # | ||
128 | # -L paths for finding and -ljava | ||
129 | # | ||
130 | -LDFLAGS_OPT = -Xlinker -O1 | ||
131 | +LDFLAGS_OPT = $(OE_LDFLAGS) | ||
132 | LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) | ||
133 | LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
134 | |||
135 | Index: openjdk/jdk/make/common/Defs-linux.gmk | ||
136 | =================================================================== | ||
137 | --- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100 | ||
138 | +++ openjdk/jdk/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100 | ||
139 | @@ -92,9 +92,9 @@ | ||
140 | CC_NO_OPT = | ||
141 | |||
142 | ifeq ($(PRODUCT), java) | ||
143 | - _OPT = $(CC_HIGHER_OPT) | ||
144 | + _OPT = $(OE_CFLAGS) | ||
145 | else | ||
146 | - _OPT = $(CC_LOWER_OPT) | ||
147 | + _OPT = $(OE_CFLAGS) | ||
148 | CPPFLAGS_DBG += -DLOGGING | ||
149 | endif | ||
150 | |||
151 | @@ -104,7 +104,7 @@ | ||
152 | # as the default. | ||
153 | CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN | ||
154 | CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
155 | -CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN | ||
156 | +CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
157 | CFLAGS_REQUIRED_hppa += | ||
158 | CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
159 | CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN | ||
160 | @@ -231,7 +231,7 @@ | ||
161 | # | ||
162 | # -L paths for finding and -ljava | ||
163 | # | ||
164 | -LDFLAGS_OPT = -Xlinker -O1 | ||
165 | +LDFLAGS_OPT = $(OE_LDFLAGS) | ||
166 | LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) | ||
167 | LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) | ||
168 | |||
169 | Index: openjdk/hotspot/make/linux/makefiles/gcc.make | ||
170 | =================================================================== | ||
171 | --- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:54:57.000000000 +0100 | ||
172 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:55:07.000000000 +0100 | ||
173 | @@ -119,7 +119,7 @@ | ||
174 | CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) | ||
175 | |||
176 | # The flags to use for an Optimized g++ build | ||
177 | -OPT_CFLAGS += -O3 | ||
178 | +OPT_CFLAGS += $(OE_CFLAGS) | ||
179 | |||
180 | # Hotspot uses very unstrict aliasing turn this optimization off | ||
181 | OPT_CFLAGS += -fno-strict-aliasing | ||
182 | @@ -148,7 +148,7 @@ | ||
183 | endif | ||
184 | |||
185 | # Enable linker optimization | ||
186 | -LFLAGS += -Xlinker -O1 | ||
187 | +LFLAGS += $(OE_LDFLAGS) | ||
188 | |||
189 | # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. | ||
190 | MAPFLAG = -Xlinker --version-script=FILENAME | ||
191 | Index: openjdk/hotspot/make/linux/makefiles/launcher.make | ||
192 | =================================================================== | ||
193 | --- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:55:19.000000000 +0100 | ||
194 | +++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:56:05.000000000 +0100 | ||
195 | @@ -44,7 +44,7 @@ | ||
196 | LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) | ||
197 | else | ||
198 | LAUNCHER.o = launcher.o | ||
199 | - LFLAGS_LAUNCHER += -L `pwd` | ||
200 | + LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS) | ||
201 | LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ | ||
202 | endif | ||
203 | |||
204 | Index: icedtea6-1.8.5/build/openjdk/jdk/make/sun/xawt/Makefile | ||
205 | =================================================================== | ||
206 | --- openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:17:03.926207269 +0100 | ||
207 | +++ openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:30:11.956186631 +0100 | ||
208 | @@ -245,7 +245,7 @@ | ||
209 | $(CHMOD) +w $@;\ | ||
210 | else \ | ||
211 | $(ECHO) GENERATING $@; \ | ||
212 | - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
213 | + $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ | ||
214 | fi | ||
215 | @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ | ||
216 | $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ | ||
217 | Index: openjdk/hotspot/make/linux/makefiles/jsig.make | ||
218 | =================================================================== | ||
219 | --- openjdk/hotspot/make/linux/makefiles/jsig.make 2010-02-17 04:11:04.000000000 +0100 | ||
220 | +++ openjdk/hotspot/make/linux/makefiles/jsig.make 2011-11-18 22:56:03.923900991 +0100 | ||
221 | @@ -39,7 +39,7 @@ | ||
222 | # cause problems with interposing. See CR: 6466665 | ||
223 | # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) | ||
224 | |||
225 | -LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT | ||
226 | +LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(OE_LDFLAGS) | ||
227 | |||
228 | # DEBUG_BINARIES overrides everything, use full -g debug information | ||
229 | ifeq ($(DEBUG_BINARIES), true) | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch b/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch deleted file mode 100644 index 59d806d..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-fix-jar-command.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: icedtea6-1.8/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/Makefile.am 2010-06-17 10:29:13.654666801 +0200 | ||
4 | +++ icedtea6-1.8/Makefile.am 2010-06-17 10:30:50.334670771 +0200 | ||
5 | @@ -1750,7 +1745,7 @@ | ||
6 | stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR) | ||
7 | if WITH_RHINO | ||
8 | mkdir -p rhino/rhino.{old,new} | ||
9 | - (cd rhino/rhino.old ; jar xf $(RHINO_JAR)) | ||
10 | + (cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) | ||
11 | $(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \ | ||
12 | com.redhat.rewriter.ClassRewriter \ | ||
13 | $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \ | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch b/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch deleted file mode 100644 index 01dcb82..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-hasgettransfer.patch +++ /dev/null | |||
@@ -1,131 +0,0 @@ | |||
1 | Index: openjdk/jdk/src/share/classes/javax/swing/HasGetTransferHandler.java | ||
2 | =================================================================== | ||
3 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
4 | +++ openjdk/jdk/src/share/classes/javax/swing/HasGetTransferHandler.java 2011-11-18 20:44:00.281649848 +0100 | ||
5 | @@ -0,0 +1,38 @@ | ||
6 | +/* | ||
7 | + * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. | ||
8 | + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
9 | + * | ||
10 | + * This code is free software; you can redistribute it and/or modify it | ||
11 | + * under the terms of the GNU General Public License version 2 only, as | ||
12 | + * published by the Free Software Foundation. Sun designates this | ||
13 | + * particular file as subject to the "Classpath" exception as provided | ||
14 | + * by Sun in the LICENSE file that accompanied this code. | ||
15 | + * | ||
16 | + * This code is distributed in the hope that it will be useful, but WITHOUT | ||
17 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
18 | + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
19 | + * version 2 for more details (a copy is included in the LICENSE file that | ||
20 | + * accompanied this code). | ||
21 | + * | ||
22 | + * You should have received a copy of the GNU General Public License version | ||
23 | + * 2 along with this work; if not, write to the Free Software Foundation, | ||
24 | + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
25 | + * | ||
26 | + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
27 | + * CA 95054 USA or visit www.sun.com if you need additional information or | ||
28 | + * have any questions. | ||
29 | + */ | ||
30 | +package javax.swing; | ||
31 | + | ||
32 | +/** | ||
33 | + * An interface to tag things with a {@code getTransferHandler} method. | ||
34 | + */ | ||
35 | +interface HasGetTransferHandler { | ||
36 | + | ||
37 | + /** Returns the {@code TransferHandler}. | ||
38 | + * | ||
39 | + * @return The {@code TransferHandler} or {@code null} | ||
40 | + */ | ||
41 | + public TransferHandler getTransferHandler(); | ||
42 | +} | ||
43 | + | ||
44 | Index: openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java | ||
45 | =================================================================== | ||
46 | --- openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java 2011-11-18 18:51:22.000000000 +0100 | ||
47 | +++ openjdk/jdk/src/share/classes/javax/swing/TransferHandler.java 2011-11-18 20:44:01.628219313 +0100 | ||
48 | @@ -122,18 +122,6 @@ | ||
49 | public static final int LINK = DnDConstants.ACTION_LINK; | ||
50 | |||
51 | /** | ||
52 | - * An interface to tag things with a {@code getTransferHandler} method. | ||
53 | - */ | ||
54 | - interface HasGetTransferHandler { | ||
55 | - | ||
56 | - /** Returns the {@code TransferHandler}. | ||
57 | - * | ||
58 | - * @return The {@code TransferHandler} or {@code null} | ||
59 | - */ | ||
60 | - public TransferHandler getTransferHandler(); | ||
61 | - } | ||
62 | - | ||
63 | - /** | ||
64 | * Represents a location where dropped data should be inserted. | ||
65 | * This is a base class that only encapsulates a point. | ||
66 | * Components supporting drop may provide subclasses of this | ||
67 | diff --git a/jdk/src/share/classes/javax/swing/JApplet.java b/jdk/src/share/classes/javax/swing/JApplet.java | ||
68 | index 47f792a..72c2cf9 100644 | ||
69 | --- openjdk/jdk/src/share/classes/javax/swing/JApplet.java | ||
70 | +++ openjdk/jdk/src/share/classes/javax/swing/JApplet.java | ||
71 | @@ -91,7 +91,7 @@ import javax.accessibility.*; | ||
72 | */ | ||
73 | public class JApplet extends Applet implements Accessible, | ||
74 | RootPaneContainer, | ||
75 | - TransferHandler.HasGetTransferHandler | ||
76 | + HasGetTransferHandler | ||
77 | { | ||
78 | /** | ||
79 | * @see #getRootPane | ||
80 | diff --git a/jdk/src/share/classes/javax/swing/JComponent.java b/jdk/src/share/classes/javax/swing/JComponent.java | ||
81 | index 4293a4f..0c0a1dc 100644 | ||
82 | --- openjdk/jdk/src/share/classes/javax/swing/JComponent.java | ||
83 | +++ openjdk/jdk/src/share/classes/javax/swing/JComponent.java | ||
84 | @@ -171,7 +171,7 @@ import sun.swing.UIClientPropertyKey; | ||
85 | * @author Arnaud Weber | ||
86 | */ | ||
87 | public abstract class JComponent extends Container implements Serializable, | ||
88 | - TransferHandler.HasGetTransferHandler | ||
89 | + HasGetTransferHandler | ||
90 | { | ||
91 | /** | ||
92 | * @see #getUIClassID | ||
93 | diff --git a/jdk/src/share/classes/javax/swing/JDialog.java b/jdk/src/share/classes/javax/swing/JDialog.java | ||
94 | index a0193d1..aeeb243 100644 | ||
95 | --- openjdk/jdk/src/share/classes/javax/swing/JDialog.java | ||
96 | +++ openjdk/jdk/src/share/classes/javax/swing/JDialog.java | ||
97 | @@ -97,7 +97,7 @@ import javax.accessibility.*; | ||
98 | public class JDialog extends Dialog implements WindowConstants, | ||
99 | Accessible, | ||
100 | RootPaneContainer, | ||
101 | - TransferHandler.HasGetTransferHandler | ||
102 | + HasGetTransferHandler | ||
103 | { | ||
104 | /** | ||
105 | * Key into the AppContext, used to check if should provide decorations | ||
106 | diff --git a/jdk/src/share/classes/javax/swing/JFrame.java b/jdk/src/share/classes/javax/swing/JFrame.java | ||
107 | index 9910b43..4cb8f58 100644 | ||
108 | --- openjdk/jdk/src/share/classes/javax/swing/JFrame.java | ||
109 | +++ openjdk/jdk/src/share/classes/javax/swing/JFrame.java | ||
110 | @@ -109,7 +109,7 @@ import javax.accessibility.*; | ||
111 | public class JFrame extends Frame implements WindowConstants, | ||
112 | Accessible, | ||
113 | RootPaneContainer, | ||
114 | - TransferHandler.HasGetTransferHandler | ||
115 | + HasGetTransferHandler | ||
116 | { | ||
117 | /** | ||
118 | * The exit application default window close operation. If a window | ||
119 | diff --git a/jdk/src/share/classes/javax/swing/JWindow.java b/jdk/src/share/classes/javax/swing/JWindow.java | ||
120 | index c94803c..85bbb57 100644 | ||
121 | --- openjdk/jdk/src/share/classes/javax/swing/JWindow.java | ||
122 | +++ openjdk/jdk/src/share/classes/javax/swing/JWindow.java | ||
123 | @@ -91,7 +91,7 @@ import javax.accessibility.*; | ||
124 | */ | ||
125 | public class JWindow extends Window implements Accessible, | ||
126 | RootPaneContainer, | ||
127 | - TransferHandler.HasGetTransferHandler | ||
128 | + HasGetTransferHandler | ||
129 | { | ||
130 | /** | ||
131 | * The <code>JRootPane</code> instance that manages the | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch b/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch deleted file mode 100644 index 5f2c98b..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-hostbuildcc.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: openjdk/hotspot/make/linux/makefiles/rules.make | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:22:33.201668748 +0100 | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:23:08.480415783 +0100 | ||
5 | @@ -39,6 +39,7 @@ | ||
6 | # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++). | ||
7 | C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) | ||
8 | CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) | ||
9 | +CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS) | ||
10 | |||
11 | AS.S = $(AS) $(ASFLAGS) | ||
12 | |||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch deleted file mode 100644 index faa90ea..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-glibc-version.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:22:13.696298239 +0200 | ||
4 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:24:15.308790737 +0200 | ||
5 | @@ -49,7 +49,6 @@ | ||
6 | # include <string.h> | ||
7 | # include <syscall.h> | ||
8 | # include <sys/sysinfo.h> | ||
9 | -# include <gnu/libc-version.h> | ||
10 | # include <sys/ipc.h> | ||
11 | # include <sys/shm.h> | ||
12 | # include <link.h> | ||
13 | @@ -544,9 +543,7 @@ | ||
14 | os::Linux::set_glibc_version(str); | ||
15 | } else { | ||
16 | // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version() | ||
17 | - static char _gnu_libc_version[32]; | ||
18 | - jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version), | ||
19 | - "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release()); | ||
20 | + static char _gnu_libc_version[32] = "2.9"; | ||
21 | os::Linux::set_glibc_version(_gnu_libc_version); | ||
22 | } | ||
23 | |||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch deleted file mode 100644 index 7c5da59..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isfinte.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:28.576131825 +0200 | ||
4 | +++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:55.555711815 +0200 | ||
5 | @@ -235,8 +235,8 @@ | ||
6 | |||
7 | // Checking for finiteness | ||
8 | |||
9 | -inline int g_isfinite(jfloat f) { return finite(f); } | ||
10 | -inline int g_isfinite(jdouble f) { return finite(f); } | ||
11 | +inline int g_isfinite(jfloat f) { return isfinite(f); } | ||
12 | +inline int g_isfinite(jdouble f) { return isfinite(f); } | ||
13 | |||
14 | |||
15 | // Wide characters | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch deleted file mode 100644 index 494e965..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-isnanf.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:47:12.695674808 +0200 | ||
4 | +++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:48:08.699007491 +0200 | ||
5 | @@ -220,14 +220,14 @@ | ||
6 | // checking for nanness | ||
7 | #ifdef SOLARIS | ||
8 | #ifdef SPARC | ||
9 | -inline int g_isnan(float f) { return isnanf(f); } | ||
10 | +inline int g_isnan(float f) { return __isnanf(f); } | ||
11 | #else | ||
12 | // isnanf() broken on Intel Solaris use isnand() | ||
13 | inline int g_isnan(float f) { return isnand(f); } | ||
14 | #endif | ||
15 | inline int g_isnan(double f) { return isnand(f); } | ||
16 | #elif LINUX | ||
17 | -inline int g_isnan(float f) { return isnanf(f); } | ||
18 | +inline int g_isnan(float f) { return __isnanf(f); } | ||
19 | inline int g_isnan(double f) { return isnan(f); } | ||
20 | #else | ||
21 | #error "missing platform-specific definition here" | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch b/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch deleted file mode 100644 index 7da41fd..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-hotspot-loadavg.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:16:09.406334411 +0200 | ||
4 | +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:19:38.952152043 +0200 | ||
5 | @@ -4325,7 +4325,22 @@ | ||
6 | // Linux doesn't yet have a (official) notion of processor sets, | ||
7 | // so just return the system wide load average. | ||
8 | int os::loadavg(double loadavg[], int nelem) { | ||
9 | - return ::getloadavg(loadavg, nelem); | ||
10 | + | ||
11 | + FILE *LOADAVG; | ||
12 | + double avg[3] = { 0.0, 0.0, 0.0 }; | ||
13 | + int i, res = -1;; | ||
14 | + | ||
15 | + if ((LOADAVG = fopen("/proc/loadavg", "r"))) { | ||
16 | + fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]); | ||
17 | + res = 0; | ||
18 | + fclose(LOADAVG); | ||
19 | + } | ||
20 | + | ||
21 | + for (i = 0; (i < nelem) && (i < 3); i++) { | ||
22 | + loadavg[i] = avg[i]; | ||
23 | + } | ||
24 | + | ||
25 | + return res; | ||
26 | } | ||
27 | |||
28 | void os::pause() { | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch deleted file mode 100644 index 9c70ba1..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-RTLD_NOLOAD.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-13 15:18:05.655136951 +0200 | ||
4 | +++ openjdk/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-13 15:20:29.601377967 +0200 | ||
5 | @@ -51,7 +51,7 @@ | ||
6 | { | ||
7 | const char *libName = (*env)->GetStringUTFChars(env, jLibName, NULL); | ||
8 | // look up existing handle only, do not load | ||
9 | - void *hModule = dlopen(libName, RTLD_NOLOAD); | ||
10 | + void *hModule = dlopen(libName, RTLD_LAZY); | ||
11 | dprintf2("-handle for %s: %u\n", libName, hModule); | ||
12 | (*env)->ReleaseStringUTFChars(env, jLibName, libName); | ||
13 | return (jlong)hModule; | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch deleted file mode 100644 index 68f8581..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-iconv-uclibc.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/java/npt/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200 | ||
4 | +++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +0200 | ||
5 | @@ -65,6 +65,8 @@ | ||
6 | # We don't want to link against -ljava | ||
7 | JAVALIB= | ||
8 | |||
9 | +LDLIBS += -liconv | ||
10 | + | ||
11 | # Add -export options to explicitly spell exported symbols | ||
12 | ifeq ($(PLATFORM), windows) | ||
13 | OTHER_LCF += -export:nptInitialize -export:nptTerminate | ||
14 | Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile | ||
15 | =================================================================== | ||
16 | --- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200 | ||
17 | +++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +0200 | ||
18 | @@ -123,6 +123,8 @@ | ||
19 | # We don't want to link against -ljava | ||
20 | JAVALIB= | ||
21 | |||
22 | +LDLIBS += -liconv | ||
23 | + | ||
24 | # | ||
25 | # Add to ambient vpath so we pick up the library files | ||
26 | # | ||
27 | Index: openjdk/jdk/make/sun/splashscreen/Makefile | ||
28 | =================================================================== | ||
29 | --- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200 | ||
30 | +++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200 | ||
31 | @@ -55,6 +55,8 @@ | ||
32 | |||
33 | JAVALIB= | ||
34 | |||
35 | +LDLIBS += -liconv | ||
36 | + | ||
37 | # | ||
38 | # C Flags | ||
39 | # | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch deleted file mode 100644 index 5423fde..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-remove-unused-backtrace.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:45:56.607257503 +0200 | ||
4 | +++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:47:19.727254686 +0200 | ||
5 | @@ -27,9 +27,6 @@ | ||
6 | #include <X11/Xutil.h> | ||
7 | #include <X11/Xos.h> | ||
8 | #include <X11/Xatom.h> | ||
9 | -#ifdef __linux__ | ||
10 | -#include <execinfo.h> | ||
11 | -#endif | ||
12 | |||
13 | #include <jvm.h> | ||
14 | #include <jni.h> | ||
15 | @@ -689,26 +686,6 @@ | ||
16 | return ret; | ||
17 | } | ||
18 | |||
19 | -#ifdef __linux__ | ||
20 | -void print_stack(void) | ||
21 | -{ | ||
22 | - void *array[10]; | ||
23 | - size_t size; | ||
24 | - char **strings; | ||
25 | - size_t i; | ||
26 | - | ||
27 | - size = backtrace (array, 10); | ||
28 | - strings = backtrace_symbols (array, size); | ||
29 | - | ||
30 | - fprintf (stderr, "Obtained %zd stack frames.\n", size); | ||
31 | - | ||
32 | - for (i = 0; i < size; i++) | ||
33 | - fprintf (stderr, "%s\n", strings[i]); | ||
34 | - | ||
35 | - free (strings); | ||
36 | -} | ||
37 | -#endif | ||
38 | - | ||
39 | Window get_xawt_root_shell(JNIEnv *env) { | ||
40 | static jclass classXRootWindow = NULL; | ||
41 | static jmethodID methodGetXRootWindow = NULL; | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch b/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch deleted file mode 100644 index 40564f0..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-jdk-unpack-uclibc.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/com/sun/java/pack/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:21.548426411 +0200 | ||
4 | +++ openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:43.858007543 +0200 | ||
5 | @@ -103,6 +103,7 @@ | ||
6 | OTHER_LDLIBS += $(LIBCXX) -lc | ||
7 | # setup the list of libraries to link in... | ||
8 | ifeq ($(PLATFORM), linux) | ||
9 | + OTHER_LDLIBS += -lpthread | ||
10 | ifeq ("$(CC_VER_MAJOR)", "3") | ||
11 | OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic | ||
12 | endif | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch deleted file mode 100644 index ee24afa..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-launcher-stdc++.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: openjdk/hotspot/make/linux/makefiles/launcher.make | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-16 17:30:56.000000000 +0100 | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-16 17:31:13.000000000 +0100 | ||
5 | @@ -45,7 +45,7 @@ | ||
6 | else | ||
7 | LAUNCHER.o = launcher.o | ||
8 | LFLAGS_LAUNCHER += -L `pwd` | ||
9 | - LIBS_LAUNCHER += -l$(JVM) $(LIBS) | ||
10 | + LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ | ||
11 | endif | ||
12 | |||
13 | LINK_LAUNCHER = $(LINK.c) | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch b/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch deleted file mode 100644 index 024969d..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-libnet-renaming.patch +++ /dev/null | |||
@@ -1,148 +0,0 @@ | |||
1 | Index: openjdk/jdk/make/java/net/Makefile | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/make/java/net/Makefile 2010-07-05 12:28:58.476625401 +0200 | ||
4 | +++ openjdk/jdk/make/java/net/Makefile 2010-07-05 12:29:11.876625138 +0200 | ||
5 | @@ -25,7 +25,7 @@ | ||
6 | |||
7 | BUILDDIR = ../.. | ||
8 | PACKAGE = java.net | ||
9 | -LIBRARY = net | ||
10 | +LIBRARY = javanet | ||
11 | PRODUCT = sun | ||
12 | include $(BUILDDIR)/common/Defs.gmk | ||
13 | |||
14 | Index: openjdk/jdk/make/java/nio/Makefile | ||
15 | =================================================================== | ||
16 | --- openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:31:27.046626250 +0200 | ||
17 | +++ openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:32:06.647874890 +0200 | ||
18 | @@ -139,11 +139,11 @@ | ||
19 | endif | ||
20 | ifeq ($(PLATFORM), linux) | ||
21 | COMPILER_WARNINGS_FATAL=true | ||
22 | -OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl | ||
23 | +OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl | ||
24 | endif | ||
25 | ifeq ($(PLATFORM), solaris) | ||
26 | OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \ | ||
27 | - -L$(LIBDIR)/$(LIBARCH) -ljava -lnet | ||
28 | + -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet | ||
29 | endif # PLATFORM | ||
30 | |||
31 | # | ||
32 | Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java | ||
33 | =================================================================== | ||
34 | --- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:40:56.467876415 +0200 | ||
35 | +++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:41:43.326628410 +0200 | ||
36 | @@ -58,7 +58,7 @@ | ||
37 | */ | ||
38 | static { | ||
39 | java.security.AccessController.doPrivileged( | ||
40 | - new sun.security.action.LoadLibraryAction("net")); | ||
41 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
42 | } | ||
43 | |||
44 | /** | ||
45 | Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java | ||
46 | =================================================================== | ||
47 | --- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:01.027875484 +0200 | ||
48 | +++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:56.826626386 +0200 | ||
49 | @@ -74,7 +74,7 @@ | ||
50 | */ | ||
51 | static { | ||
52 | java.security.AccessController.doPrivileged( | ||
53 | - new sun.security.action.LoadLibraryAction("net")); | ||
54 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
55 | } | ||
56 | |||
57 | /** | ||
58 | Index: openjdk/jdk/src/share/classes/java/net/DatagramPacket.java | ||
59 | =================================================================== | ||
60 | --- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:41:02.017875980 +0200 | ||
61 | +++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:42:06.057875677 +0200 | ||
62 | @@ -47,7 +47,7 @@ | ||
63 | */ | ||
64 | static { | ||
65 | java.security.AccessController.doPrivileged( | ||
66 | - new sun.security.action.LoadLibraryAction("net")); | ||
67 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
68 | init(); | ||
69 | } | ||
70 | |||
71 | Index: openjdk/jdk/src/share/classes/java/net/InetAddress.java | ||
72 | =================================================================== | ||
73 | --- openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:41:02.756626429 +0200 | ||
74 | +++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:42:15.997875786 +0200 | ||
75 | @@ -230,7 +230,7 @@ | ||
76 | static { | ||
77 | preferIPv6Address = java.security.AccessController.doPrivileged( | ||
78 | new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue(); | ||
79 | - AccessController.doPrivileged(new LoadLibraryAction("net")); | ||
80 | + AccessController.doPrivileged(new LoadLibraryAction("javanet")); | ||
81 | init(); | ||
82 | } | ||
83 | |||
84 | Index: openjdk/jdk/src/share/classes/java/net/NetworkInterface.java | ||
85 | =================================================================== | ||
86 | --- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:41:03.547875282 +0200 | ||
87 | +++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:42:22.647875475 +0200 | ||
88 | @@ -52,7 +52,7 @@ | ||
89 | private boolean virtual = false; | ||
90 | |||
91 | static { | ||
92 | - AccessController.doPrivileged(new LoadLibraryAction("net")); | ||
93 | + AccessController.doPrivileged(new LoadLibraryAction("javanet")); | ||
94 | init(); | ||
95 | } | ||
96 | |||
97 | Index: openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java | ||
98 | =================================================================== | ||
99 | --- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:41:04.306628153 +0200 | ||
100 | +++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:42:32.666627264 +0200 | ||
101 | @@ -89,7 +89,7 @@ | ||
102 | }}); | ||
103 | if (b != null && b.booleanValue()) { | ||
104 | java.security.AccessController.doPrivileged( | ||
105 | - new sun.security.action.LoadLibraryAction("net")); | ||
106 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
107 | hasSystemProxies = init(); | ||
108 | } | ||
109 | } | ||
110 | Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/share/classes/sun/nio/ch/Util.java | ||
111 | =================================================================== | ||
112 | --- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:41:05.086626745 +0200 | ||
113 | +++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:42:39.266626410 +0200 | ||
114 | @@ -354,7 +354,7 @@ | ||
115 | return; | ||
116 | loaded = true; | ||
117 | java.security.AccessController | ||
118 | - .doPrivileged(new sun.security.action.LoadLibraryAction("net")); | ||
119 | + .doPrivileged(new sun.security.action.LoadLibraryAction("javanet")); | ||
120 | java.security.AccessController | ||
121 | .doPrivileged(new sun.security.action.LoadLibraryAction("nio")); | ||
122 | // IOUtil must be initialized; Its native methods are called from | ||
123 | Index: openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java | ||
124 | =================================================================== | ||
125 | --- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:05.896626691 +0200 | ||
126 | +++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:45.606625991 +0200 | ||
127 | @@ -244,7 +244,7 @@ | ||
128 | |||
129 | static { | ||
130 | java.security.AccessController.doPrivileged( | ||
131 | - new sun.security.action.LoadLibraryAction("net")); | ||
132 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
133 | } | ||
134 | |||
135 | } | ||
136 | Index: henning/bug/com.buglabs.build.oe/tmp/work/armv7a-angstrom-linux-gnueabi/openjdk-6-jre-6b18-1.8-r3.3/openjdk-src-dir/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java | ||
137 | =================================================================== | ||
138 | --- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:06.786627210 +0200 | ||
139 | +++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:51.926627747 +0200 | ||
140 | @@ -160,7 +160,7 @@ | ||
141 | |||
142 | static { | ||
143 | java.security.AccessController.doPrivileged( | ||
144 | - new sun.security.action.LoadLibraryAction("net")); | ||
145 | + new sun.security.action.LoadLibraryAction("javanet")); | ||
146 | init0(); | ||
147 | |||
148 | // start the address listener thread | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch b/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch deleted file mode 100644 index e47ee50..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-llvm_headers.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | Index: openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-11-18 20:38:09.000000000 +0100 | ||
4 | +++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-11-18 21:03:15.781644337 +0100 | ||
5 | @@ -38,7 +38,11 @@ | ||
6 | #include <llvm/ModuleProvider.h> | ||
7 | #endif | ||
8 | #include <llvm/Support/IRBuilder.h> | ||
9 | +#if SHARK_LLVM_VERSION >= 29 | ||
10 | +#include <llvm/Support/Threading.h> | ||
11 | +#else | ||
12 | #include <llvm/System/Threading.h> | ||
13 | +#endif | ||
14 | #include <llvm/Target/TargetSelect.h> | ||
15 | #include <llvm/Type.h> | ||
16 | #include <llvm/ExecutionEngine/JITMemoryManager.h> | ||
17 | @@ -47,8 +51,12 @@ | ||
18 | #include <llvm/ExecutionEngine/JIT.h> | ||
19 | #include <llvm/ADT/StringMap.h> | ||
20 | #include <llvm/Support/Debug.h> | ||
21 | +#if SHARK_LLVM_VERSION >= 29 | ||
22 | +#include <llvm/Support/Host.h> | ||
23 | +#else | ||
24 | #include <llvm/System/Host.h> | ||
25 | #endif | ||
26 | +#endif | ||
27 | |||
28 | #include <map> | ||
29 | |||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch b/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch deleted file mode 100644 index f2ad035..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-remove_werror.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Index: openjdk/hotspot/make/linux/makefiles/gcc.make | ||
2 | =================================================================== | ||
3 | --- openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:35.758533706 +0100 | ||
4 | +++ openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:42.761456458 +0100 | ||
5 | @@ -98,9 +98,6 @@ | ||
6 | CFLAGS += -pipe | ||
7 | endif | ||
8 | |||
9 | -# Compiler warnings are treated as errors | ||
10 | -WARNINGS_ARE_ERRORS = -Werror | ||
11 | - | ||
12 | # Except for a few acceptable ones | ||
13 | # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit | ||
14 | # conversions which might affect the values. To avoid that, we need to turn | ||
diff --git a/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch b/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch deleted file mode 100644 index 9f875de..0000000 --- a/recipes-core/openjdk/openjdk-6/icedtea-unbreak-float.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h | ||
2 | =================================================================== | ||
3 | --- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100 | ||
4 | +++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100 | ||
5 | @@ -27,13 +27,11 @@ | ||
6 | |||
7 | #include "jfdlibm.h" | ||
8 | |||
9 | -#ifdef __NEWVALID /* special setup for Sun test regime */ | ||
10 | #if defined(i386) || defined(i486) || \ | ||
11 | defined(intel) || defined(x86) || \ | ||
12 | defined(i86pc) || defined(_M_IA64) || defined(ia64) | ||
13 | #define _LITTLE_ENDIAN | ||
14 | #endif | ||
15 | -#endif | ||
16 | |||
17 | #ifdef _LITTLE_ENDIAN | ||
18 | #define __HI(x) *(1+(int*)&x) | ||
diff --git a/recipes-core/openjdk/openjdk-6/jvm.cfg b/recipes-core/openjdk/openjdk-6/jvm.cfg deleted file mode 100644 index 9e008e9..0000000 --- a/recipes-core/openjdk/openjdk-6/jvm.cfg +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | # Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. | ||
2 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
3 | # | ||
4 | # This code is free software; you can redistribute it and/or modify it | ||
5 | # under the terms of the GNU General Public License version 2 only, as | ||
6 | # published by the Free Software Foundation. Sun designates this | ||
7 | # particular file as subject to the "Classpath" exception as provided | ||
8 | # by Sun in the LICENSE file that accompanied this code. | ||
9 | # | ||
10 | # This code is distributed in the hope that it will be useful, but WITHOUT | ||
11 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
12 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
13 | # version 2 for more details (a copy is included in the LICENSE file that | ||
14 | # accompanied this code). | ||
15 | # | ||
16 | # You should have received a copy of the GNU General Public License version | ||
17 | # 2 along with this work; if not, write to the Free Software Foundation, | ||
18 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
19 | # | ||
20 | # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | ||
21 | # CA 95054 USA or visit www.sun.com if you need additional information or | ||
22 | # have any questions. | ||
23 | # | ||
24 | # | ||
25 | # List of JVMs that can be used as an option to java, javac, etc. | ||
26 | # Order is important -- first in this list is the default JVM. | ||
27 | # NOTE that this both this file and its format are UNSUPPORTED and | ||
28 | # WILL GO AWAY in a future release. | ||
29 | # | ||
30 | # You may also select a JVM in an arbitrary location with the | ||
31 | # "-XXaltjvm=<jvm_dir>" option, but that too is unsupported | ||
32 | # and may not be available in a future release. | ||
33 | # | ||
34 | -server ERROR | ||
35 | -client IGNORE | ||
36 | -hotspot ERROR | ||
37 | -classic WARN | ||
38 | -native ERROR | ||
39 | -green ERROR | ||
40 | -zero ALIASED_TO -server | ||
41 | -cacao ERROR | ||
diff --git a/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch b/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch deleted file mode 100644 index 13280b3..0000000 --- a/recipes-core/openjdk/openjdk-6/mkbc_returncode.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | Index: icedtea6/ports/hotspot/tools/mkbc.c | ||
2 | =================================================================== | ||
3 | --- icedtea6.orig/ports/hotspot/tools/mkbc.c 2010-04-01 12:25:13.791317722 +0200 | ||
4 | +++ icedtea6/ports/hotspot/tools/mkbc.c 2010-04-01 12:27:34.151606177 +0200 | ||
5 | @@ -602,4 +602,6 @@ | ||
6 | if (ferror(bci_f)) fatal("Error writing bci"); | ||
7 | if (source_f != stdin) fclose(source_f); | ||
8 | if (bci_f != stdout) fclose(bci_f); | ||
9 | + | ||
10 | + return 0; | ||
11 | } | ||
diff --git a/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch b/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch deleted file mode 100644 index df9e147..0000000 --- a/recipes-core/openjdk/openjdk-6/shark-arm-linux-cpu-detection.patch +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | Index: icedtea6-1.8/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:42:48.412103129 +0200 | ||
4 | +++ icedtea6-1.8/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:50:51.680282178 +0200 | ||
5 | @@ -32,6 +32,96 @@ | ||
6 | |||
7 | #if SHARK_LLVM_VERSION >= 27 | ||
8 | namespace { | ||
9 | + | ||
10 | +#if defined(__arm__) && defined(__linux__) | ||
11 | +#include <fcntl.h> | ||
12 | +#include <linux/auxvec.h> | ||
13 | +#include <asm/hwcap.h> | ||
14 | +#define VECBUFF_SIZE 32 | ||
15 | + | ||
16 | +bool TestARMLinuxHWCAP(int feature) { | ||
17 | + int fd; | ||
18 | + unsigned vecs[VECBUFF_SIZE]; | ||
19 | + unsigned *p; | ||
20 | + int i, n; | ||
21 | + int rc; | ||
22 | + | ||
23 | + rc = 0; | ||
24 | + fd = open("/proc/self/auxv", O_RDONLY); | ||
25 | + if (fd < 0) return 0; | ||
26 | + do { | ||
27 | + n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned)); | ||
28 | + p = vecs; | ||
29 | + i = n/8; | ||
30 | + while (--i >=0) { | ||
31 | + unsigned tag = *p++; | ||
32 | + unsigned value = *p++; | ||
33 | + if (tag == 0) goto fini; | ||
34 | + if(tag == AT_HWCAP && (value & feature)) { | ||
35 | + rc = 1; | ||
36 | + goto fini; | ||
37 | + } | ||
38 | + } | ||
39 | + } while (n == VECBUFF_SIZE * sizeof(unsigned)); | ||
40 | +fini: | ||
41 | + close(fd); | ||
42 | + return rc; | ||
43 | +} | ||
44 | + | ||
45 | +char* TestARMLinuxAT(int auxvec) { | ||
46 | + int fd; | ||
47 | + unsigned vecs[VECBUFF_SIZE]; | ||
48 | + unsigned *p; | ||
49 | + int i, n; | ||
50 | + char* rc; | ||
51 | + | ||
52 | + rc = 0; | ||
53 | + fd = open("/proc/self/auxv", O_RDONLY); | ||
54 | + if (fd < 0) return 0; | ||
55 | + do { | ||
56 | + n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned)); | ||
57 | + p = vecs; | ||
58 | + i = n/8; | ||
59 | + while (--i >=0) { | ||
60 | + unsigned tag = *p++; | ||
61 | + unsigned value = *p++; | ||
62 | + if (tag == 0) goto fini; | ||
63 | + if(tag == (unsigned) auxvec ) { | ||
64 | + rc = (char*)value; | ||
65 | + goto fini; | ||
66 | + } | ||
67 | + } | ||
68 | + } while (n == VECBUFF_SIZE * sizeof(unsigned)); | ||
69 | +fini: | ||
70 | + close(fd); | ||
71 | + return rc; | ||
72 | +} | ||
73 | + | ||
74 | +bool getARMHostCPUFeatures(StringMap<bool> &Features) { | ||
75 | + // FIXME LLVM PR6561 // Features["neon"]=TestARMLinuxHWCAP(HWCAP_NEON); | ||
76 | + Features["thumb2"]=TestARMLinuxHWCAP(HWCAP_THUMBEE); | ||
77 | + Features["vfp2"]=TestARMLinuxHWCAP(HWCAP_VFP); | ||
78 | + | ||
79 | + std::string testArchKey(TestARMLinuxAT(AT_PLATFORM)); | ||
80 | + | ||
81 | + StringMap<std::string> archLinuxToLLVMMap; | ||
82 | + archLinuxToLLVMMap["v4l"]="v4t"; | ||
83 | + archLinuxToLLVMMap["v5l"]="v5t"; | ||
84 | + archLinuxToLLVMMap["v6l"]="v6"; | ||
85 | + // FIXME change this from v6 to v7a when LLVM PR7048 have been fixed | ||
86 | + archLinuxToLLVMMap["v7l"]="v6"; | ||
87 | + | ||
88 | + llvm::StringMapIterator<std::string> resultIterator(archLinuxToLLVMMap.find( | ||
89 | + testArchKey)); | ||
90 | + if(resultIterator->first()) { | ||
91 | + std::string arch(resultIterator->second); | ||
92 | + Features[arch]=true; | ||
93 | + } | ||
94 | + | ||
95 | + return true; | ||
96 | +} | ||
97 | +#endif | ||
98 | + | ||
99 | cl::opt<std::string> | ||
100 | MCPU("mcpu"); | ||
101 | |||
102 | @@ -64,7 +154,11 @@ | ||
103 | #if SHARK_LLVM_VERSION >= 27 | ||
104 | // Finetune LLVM for the current host CPU. | ||
105 | StringMap<bool> Features; | ||
106 | +#if defined(__arm__) && defined(__linux__) | ||
107 | + bool gotCpuFeatures = getARMHostCPUFeatures(Features); | ||
108 | +#else | ||
109 | bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features); | ||
110 | +#endif | ||
111 | std::string cpu("-mcpu=" + llvm::sys::getHostCPUName()); | ||
112 | |||
113 | std::vector<const char*> args; | ||
diff --git a/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch b/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch deleted file mode 100644 index 4e89967..0000000 --- a/recipes-core/openjdk/openjdk-6/shark-build-openjdkdir.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: icedtea6-1.8/Makefile.am | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/Makefile.am 2010-06-30 11:30:49.526648376 +0200 | ||
4 | +++ icedtea6-1.8/Makefile.am 2010-06-30 11:42:02.606648734 +0200 | ||
5 | @@ -1882,7 +1882,7 @@ | ||
6 | # configure script arguments, quoted in single quotes | ||
7 | CONFIGURE_ARGS = @CONFIGURE_ARGS@ | ||
8 | ADD_ZERO_CONFIGURE_ARGS = \ | ||
9 | - --with-openjdk=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \ | ||
10 | + --with-openjdk=$(abs_top_builddir)/bootstrap/jdk1.6.0 \ | ||
11 | --enable-zero | ||
12 | if ADD_SHARK_BUILD | ||
13 | ADD_ZERO_CONFIGURE_ARGS += \ | ||
diff --git a/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch b/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch deleted file mode 100644 index ca21ccf..0000000 --- a/recipes-core/openjdk/openjdk-6/zero-cmpswap-long.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Index: icedtea6-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | ||
2 | =================================================================== | ||
3 | --- icedtea6-1.8.orig/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-06-17 10:26:16.885292426 +0200 | ||
4 | +++ icedtea6-1.8/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp 2010-06-17 10:29:19.034668305 +0200 | ||
5 | @@ -266,7 +266,15 @@ | ||
6 | volatile jlong* dest, | ||
7 | jlong compare_value) { | ||
8 | |||
9 | +#ifdef ARM | ||
10 | + return arm_compare_and_swap((jint *) dest, (jint) compare_value, (jint) exchange_value); | ||
11 | +#else | ||
12 | +#ifdef M68K | ||
13 | + return m68k_compare_and_swap((jint *) dest, (jint) compare_value, (jint) exchange_value); | ||
14 | +#else | ||
15 | return __sync_val_compare_and_swap(dest, compare_value, exchange_value); | ||
16 | +#endif // M68K | ||
17 | +#endif // ARM | ||
18 | } | ||
19 | |||
20 | inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, | ||
diff --git a/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb b/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb deleted file mode 100644 index 3daffba..0000000 --- a/recipes-core/openjdk/openjdk-6_6b24-1.11.9.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require openjdk-6-release-6b24.inc | ||
2 | |||
3 | PR = "${INC_PR}.1" | ||
4 | |||
5 | SRC_URI[iced.md5sum] = "1826c4bfb4faae1e820dd8997428a831" | ||
6 | SRC_URI[iced.sha256sum] = "0c134bea8d48c77ad5d41d4a0f98f471c381faaa0ef0c215d48687e709e93f3f" | ||
7 | |||
8 | ICEDTEAPATCHES += "file://icedtea-jdk-rmi-crosscompile.patch;apply=no" | ||
9 | |||
10 | DISTRIBUTION_PATCHES += "patches/icedtea-jdk-rmi-crosscompile.patch" | ||
diff --git a/recipes-core/openjdk/openjdk-6_6b24_hg.bb b/recipes-core/openjdk/openjdk-6_6b24_hg.bb deleted file mode 100644 index fcc9c05..0000000 --- a/recipes-core/openjdk/openjdk-6_6b24_hg.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | require openjdk-6-release-6b24.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
4 | |||
5 | PR = "${INC_PR}.0" | ||
6 | |||
7 | ICEDTEA = "icedtea6" | ||
8 | |||
9 | SRCREV = "54ceda20a02c" | ||
10 | PV = "6b24-1.11.1+1.11.2-devel+hg${SRCPV}" | ||
11 | |||
12 | ICEDTEA_URI = "hg://icedtea.classpath.org/hg/;module=icedtea6;rev=${SRCREV}" | ||
diff --git a/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb b/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb deleted file mode 100644 index 8d12a8e..0000000 --- a/recipes-core/openjdk/openjdk-6_6b27-1.12.8.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require openjdk-6-release-6b27.inc | ||
2 | |||
3 | PR = "${INC_PR}.4" | ||
4 | |||
5 | SRC_URI[iced.md5sum] = "7712c4b3b9f8092aa8c7b5cad0b46d06" | ||
6 | SRC_URI[iced.sha256sum] = "c2ad74af29af774f778675d3fde952f4defebb2be44f565253d788e2e7af39d4" | ||
diff --git a/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb b/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb deleted file mode 100644 index 69a3e1e..0000000 --- a/recipes-core/openjdk/openjdk-6_6b32-1.13.4.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require openjdk-6-release-6b32.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | SRC_URI[iced.md5sum] = "95d61221d0be3616c8c04d164df524a4" | ||
6 | SRC_URI[iced.sha256sum] = "302b17575ad98bbf6a1d4d8768d2ea1f1b070f153c660ebe493b6509d56ed0e7" | ||