From 2dcff5266a6c1ed39e49b24b8d2984a165ad9c35 Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Fri, 16 Oct 2015 19:29:38 +0200 Subject: 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 Signed-off-by: Otavio Salvador --- .../openjdk/openjdk-6-6b24/build-hacks.patch | 79 ------ .../openjdk-6-6b24/cacao-arm-ucontext.patch | 24 -- .../openjdk/openjdk-6-6b24/cacao-libtoolize.patch | 12 - .../openjdk-6-6b24/cacao-loadavg-makefile.patch | 13 - .../openjdk/openjdk-6-6b24/cacao-loadavg.patch | 27 --- .../openjdk-6-6b24/fix_hotspot_crosscompile.patch | 51 ---- .../openjdk-6-6b24/icedtea-crosscompile-fix.patch | 270 --------------------- .../openjdk-6-6b24/icedtea-fix-xrender.patch | 13 - .../openjdk-6-6b24/icedtea-hostbuildcc.patch | 12 - .../icedtea-hotspot-dlvsym-uclibc.patch | 16 -- .../icedtea-hotspot-glibc-version.patch | 23 -- .../openjdk-6-6b24/icedtea-hotspot-isfinte.patch | 15 -- .../openjdk-6-6b24/icedtea-hotspot-isnanf.patch | 21 -- .../openjdk-6-6b24/icedtea-hotspot-loadavg.patch | 28 --- .../openjdk-6-6b24/icedtea-jdk-iconv-uclibc.patch | 39 --- .../icedtea-jdk-powerpc-atomic64.patch | 65 ----- .../icedtea-jdk-remove-unused-backtrace.patch | 41 ---- .../icedtea-jdk-rmi-crosscompile.patch | 13 - .../icedtea-jdk-sizers-crosscompile-hack.patch | 61 ----- .../openjdk-6-6b24/icedtea-jdk-unpack-uclibc.patch | 12 - .../openjdk-6-6b24/icedtea-launcher-stdc++.patch | 13 - .../openjdk-6-6b24/icedtea-libnet-renaming.patch | 148 ----------- .../openjdk-6-6b24/icedtea-remove_werror.patch | 14 -- .../icedtea-shark-arm-linux-cpu-detection.patch | 113 --------- .../openjdk-6-6b24/icedtea-unbreak-float.patch | 18 -- .../openjdk-6-6b24/icedtea-zero-hotspotfix.patch | 41 ---- recipes-core/openjdk/openjdk-6-6b24/jvm.cfg | 43 ---- 27 files changed, 1225 deletions(-) delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/build-hacks.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/cacao-arm-ucontext.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/cacao-libtoolize.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg-makefile.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/fix_hotspot_crosscompile.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-crosscompile-fix.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-fix-xrender.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-hostbuildcc.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-dlvsym-uclibc.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isfinte.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-isnanf.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-loadavg.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-iconv-uclibc.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-remove-unused-backtrace.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-rmi-crosscompile.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-unpack-uclibc.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-libnet-renaming.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-remove_werror.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-shark-arm-linux-cpu-detection.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-unbreak-float.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-zero-hotspotfix.patch delete mode 100644 recipes-core/openjdk/openjdk-6-6b24/jvm.cfg (limited to 'recipes-core/openjdk/openjdk-6-6b24') 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 @@ -Index: icedtea6/Makefile.am -=================================================================== ---- icedtea6.orig/Makefile.am 2011-12-21 21:24:25.000000000 +0100 -+++ icedtea6/Makefile.am 2011-12-21 22:50:11.649227590 +0100 -@@ -538,6 +538,11 @@ - JAVAC="" \ - JAVA_HOME="" \ - JDK_HOME="" \ -+ OE_CFLAGS="$(OE_CFLAGS)" \ -+ OE_CPPFLAGS="$(OE_CPPFLAGS)" \ -+ OE_CXXFLAGS="$(OE_CXXFLAGS)" \ -+ OE_LDFLAGS="$(OE_LDFLAGS)" \ -+ OE_LAUNCHER_LDFLAGS="$(OE_LAUNCHER_LDFLAGS)" \ - DISTRIBUTION_ID="$(DIST_ID)" \ - DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \ - DEBUG_CLASSFILES="true" \ -@@ -1851,12 +1856,16 @@ - if BUILD_JAMVM - cd jamvm/jamvm && \ - LDFLAGS="-Xlinker -z -Xlinker noexecstack" \ -- ./autogen.sh --with-java-runtime-library=openjdk \ -- --prefix=$(abs_top_builddir)/jamvm/install ; \ -- $(MAKE) ; \ -- $(MAKE) install -+ $(ARCH_PREFIX) ./autogen.sh --with-java-runtime-library=openjdk \ -+ --prefix=/usr/lib \ -+ --host=$(host_alias) \ -+ --build=$(build_alias) \ -+ --target=$(target_alias) \ -+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} ; \ -+ $(ARCH_PREFIX) $(MAKE) ; \ -+ $(ARCH_PREFIX) $(MAKE) install DESTDIR=$(abs_top_builddir)/jamvm/install - mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server -- cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server -+ cp $(abs_top_builddir)/jamvm/install/usr/lib/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server - ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client - touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt - ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so -@@ -1874,7 +1883,7 @@ - stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp - if ADD_JAMVM_BUILD - mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm -- install -m 644 jamvm/install/lib/libjvm.so \ -+ install -m 644 jamvm/install/usr/lib/lib/libjvm.so \ - $(BUILD_JRE_ARCH_DIR)/jamvm/ - printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg - else -@@ -1918,6 +1927,7 @@ - --host=$(host_alias) \ - --build=$(build_alias) \ - --target=$(target_alias) \ -+ --with-libtool-sysroot=${ALT_FREETYPE_LIB_PATH} \ - --prefix=$(abs_top_builddir)/cacao/install \ - --with-java-runtime-library=openjdk \ - --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \ -@@ -1984,7 +1994,7 @@ - # configure script arguments, quoted in single quotes - CONFIGURE_ARGS = @CONFIGURE_ARGS@ - ADD_ZERO_CONFIGURE_ARGS = \ -- --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \ -+ --with-jdk-home=$(abs_top_builddir)/bootstrap/jdk1.6.0 \ - --enable-zero - if ADD_SHARK_BUILD - ADD_ZERO_CONFIGURE_ARGS += \ -Index: icedtea6/javac.in -=================================================================== ---- icedtea6.orig/javac.in 2011-12-21 21:24:30.000000000 +0100 -+++ icedtea6/javac.in 2011-12-21 22:44:25.860460813 +0100 -@@ -45,7 +45,9 @@ - my @CLASSPATH = ('@ECJ_JAR@'); - push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; - $ENV{"CLASSPATH"} = join ':', @CLASSPATH; -- exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args; -+ # Compiling hotspot-tools consumes tons of memory and exceeds any default -+ # limits for jamvm and cacao. -+ exec '@JAVA@', '-Xmx1024m', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args; - } - else - { 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 @@ -Index: cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c -=================================================================== ---- cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c 2013-01-26 21:30:54.206581090 +0100 -+++ cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c 2013-01-26 21:31:34.406991316 +0100 -@@ -28,19 +28,7 @@ - - #include - --#define ucontext broken_glibc_ucontext --#define ucontext_t broken_glibc_ucontext_t - #include --#undef ucontext --#undef ucontext_t -- --typedef struct ucontext { -- unsigned long uc_flags; -- struct ucontext *uc_link; -- stack_t uc_stack; -- struct sigcontext uc_mcontext; -- sigset_t uc_sigmask; --} ucontext_t; - - #define scontext_t struct sigcontext - 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 @@ -Index: icedtea6/Makefile.am -=================================================================== ---- icedtea6.orig/Makefile.am 2011-12-21 22:58:23.000000000 +0100 -+++ icedtea6/Makefile.am 2011-12-21 23:00:21.405887186 +0100 -@@ -1922,6 +1922,7 @@ - if BUILD_CACAO - if !USE_SYSTEM_CACAO - cd cacao/cacao && \ -+ rm -f libtool && \ - ./autogen.sh && \ - $(ARCH_PREFIX) ./configure \ - --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 @@ -Index: icedtea6-1.11.5/Makefile.am -=================================================================== ---- icedtea6-1.11.5.orig/Makefile.am 2013-01-27 21:47:24.609119623 +0100 -+++ icedtea6-1.11.5/Makefile.am 2013-01-27 21:49:31.250516775 +0100 -@@ -1993,6 +1993,8 @@ - if BUILD_CACAO - if !USE_SYSTEM_CACAO - cd cacao/cacao && \ -+ patch -p1 -N < $(abs_top_srcdir)/patches/cacao-loadavg.patch && \ -+ patch -p1 -N < $(abs_top_srcdir)/patches/cacao-arm-ucontext.patch && \ - rm -f libtool && \ - ./autogen.sh && \ - $(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 @@ -Index: cacao-cff92704c4e0/src/vm/os.hpp -=================================================================== ---- cacao-cff92704c4e0/src/vm/os.hpp 2011-12-08 13:40:45.000000000 +0100 -+++ cacao-cff92704c4e0/src/vm/os.hpp 2011-12-20 11:42:36.985633921 +0100 -@@ -425,7 +425,21 @@ - #if defined(HAVE_GETLOADAVG) - return ::getloadavg(loadavg, nelem); - #else --# error getloadavg not available -+ FILE *LOADAVG; -+ double avg[3] = { 0.0, 0.0, 0.0 }; -+ int i, res = -1;; -+ -+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) { -+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]); -+ res = 0; -+ fclose(LOADAVG); -+ } -+ -+ for (i = 0; (i < nelem) && (i < 3); i++) { -+ loadavg[i] = avg[i]; -+ } -+ -+ return res; - #endif - } - 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 @@ -Index: icedtea6/acinclude.m4 -=================================================================== ---- icedtea6.orig/acinclude.m4 2011-12-20 02:25:50.000000000 +0100 -+++ icedtea6/acinclude.m4 2011-12-20 18:02:08.340386576 +0100 -@@ -928,6 +928,21 @@ - AC_SUBST(ALT_CACAO_SRC_DIR) - ]) - -+AC_DEFUN([AC_CHECK_WITH_CC_FOR_BUILD], -+[ -+ AC_MSG_CHECKING(for compiler used for subsidiary programs) -+ AC_ARG_WITH([cc-for-build], -+ [AS_HELP_STRING(--with-cc-for-build,specify the compiler for subsidiary (helper) programs)], -+ [ -+ CC_FOR_BUILD="${withval}" -+ ], -+ [ -+ CC_FOR_BUILD="\$(CC)" -+ ]) -+ AC_MSG_RESULT(${CC_FOR_BUILD}) -+ AC_SUBST(CC_FOR_BUILD) -+]) -+ - AC_DEFUN([IT_WITH_GCJ], - [ - AC_MSG_CHECKING([whether to compile ecj natively]) -Index: icedtea6/Makefile.am -=================================================================== ---- icedtea6.orig/Makefile.am 2011-12-20 17:59:27.000000000 +0100 -+++ icedtea6/Makefile.am 2011-12-20 18:04:32.972312064 +0100 -@@ -538,6 +538,7 @@ - JAVAC="" \ - JAVA_HOME="" \ - JDK_HOME="" \ -+ CC_FOR_BUILD="$(CC_FOR_BUILD)" \ - OE_CFLAGS="$(OE_CFLAGS)" \ - OE_CPPFLAGS="$(OE_CPPFLAGS)" \ - OE_CXXFLAGS="$(OE_CXXFLAGS)" \ -Index: icedtea6/configure.ac -=================================================================== ---- icedtea6.orig/configure.ac 2011-12-20 02:25:50.000000000 +0100 -+++ icedtea6/configure.ac 2011-12-20 18:03:04.534043885 +0100 -@@ -18,6 +18,8 @@ - AC_PROG_CC - AC_PROG_CXX - -+AC_CHECK_WITH_CC_FOR_BUILD -+ - IT_FIND_TOOL([MAKE], [make]) - IT_FIND_TOOL([GZIP], [gzip]) - 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 @@ -Index: openjdk/jdk/make/sun/awt/Makefile -=================================================================== ---- openjdk.orig/jdk/make/sun/awt/Makefile 2009-01-24 17:54:57.000000000 +0100 -+++ openjdk/jdk/make/sun/awt/Makefile 2009-01-24 17:55:07.000000000 +0100 -@@ -509,10 +509,10 @@ - # - - ifeq ($(PLATFORM), linux) --CPPFLAGS += -I$(MOTIF_DIR)/include \ -- -I$(OPENWIN_HOME)/include \ -- -I$(OPENWIN_HOME)/include/X11/extensions \ -- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font -+#CPPFLAGS += -I$(MOTIF_DIR)/include \ -+# -I$(OPENWIN_HOME)/include \ -+# -I$(OPENWIN_HOME)/include/X11/extensions \ -+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font - endif - CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ -@@ -536,7 +536,7 @@ - $(EVENT_MODEL) - - ifeq ($(PLATFORM), linux) --LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) -+#LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) - endif - - LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ -Index: openjdk/jdk/make/sun/awt/mawt.gmk -=================================================================== ---- openjdk.orig/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:54:57.000000000 +0100 -+++ openjdk/jdk/make/sun/awt/mawt.gmk 2009-01-24 17:55:07.000000000 +0100 -@@ -194,8 +194,8 @@ - CPPFLAGS += -I$(CUPS_HEADERS_PATH) - - ifndef HEADLESS --CPPFLAGS += -I$(OPENWIN_HOME)/include --LDFLAGS += -L$(OPENWIN_LIB) -+#CPPFLAGS += -I$(OPENWIN_HOME)/include -+#LDFLAGS += -L$(OPENWIN_LIB) - - endif # !HEADLESS - -@@ -223,8 +223,8 @@ - - ifeq ($(PLATFORM), linux) - # Checking for the X11/extensions headers at the additional location -- CPPFLAGS += -I/X11R6/include/X11/extensions \ -- -I/usr/include/X11/extensions -+# CPPFLAGS += -I/X11R6/include/X11/extensions \ -+# -I/usr/include/X11/extensions - endif - - ifeq ($(PLATFORM), solaris) -Index: openjdk/jdk/make/sun/xawt/Makefile -=================================================================== ---- openjdk.orig/jdk/make/sun/xawt/Makefile 2009-01-24 17:54:57.000000000 +0100 -+++ openjdk/jdk/make/sun/xawt/Makefile 2009-01-24 17:55:07.000000000 +0100 -@@ -123,11 +123,12 @@ - -I$(PLATFORM_SRC)/native/sun/awt - - ifeq ($(PLATFORM), linux) -+# Very unsuitable for cross-compilation. - # Allows for builds on Debian GNU Linux, X11 is in a different place -- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ -- -I/usr/include/X11/extensions \ -- -I$(MOTIF_DIR)/include \ -- -I$(OPENWIN_HOME)/include -+# CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ -+# -I/usr/include/X11/extensions \ -+# -I$(MOTIF_DIR)/include \ -+# -I$(OPENWIN_HOME)/include - endif - - ifeq ($(PLATFORM), solaris) -Index: openjdk/hotspot/make/linux/makefiles/vm.make -=================================================================== ---- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:54:57.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/vm.make 2009-01-24 17:55:07.000000000 +0100 -@@ -170,6 +170,7 @@ - LIBS_VM += $(LLVM_LIBS) - endif - -+LFLAGS_VM += $(OE_LDFLAGS) - LINK_VM = $(LINK_LIB.c) - - # rule for building precompiled header -Index: openjdk/hotspot/make/linux/makefiles/buildtree.make -=================================================================== ---- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:54:57.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2009-01-24 17:55:07.000000000 +0100 -@@ -343,7 +343,7 @@ - echo "rm -f Queens.class"; \ - echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ - echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ -- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ -+ echo 'echo Silently skipping the execution of the gamma program'; \ - ) > $@ - $(QUIETLY) chmod +x $@ - -Index: openjdk/corba/make/common/Defs-linux.gmk -=================================================================== ---- openjdk.orig/corba/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100 -+++ openjdk/corba/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100 -@@ -82,9 +82,9 @@ - CC_NO_OPT = - - ifeq ($(PRODUCT), java) -- _OPT = $(CC_HIGHER_OPT) -+ _OPT = $(OE_CFLAGS) - else -- _OPT = $(CC_LOWER_OPT) -+ _OPT = $(OE_CFLAGS) - CPPFLAGS_DBG += -DLOGGING - endif - -@@ -94,7 +94,7 @@ - # as the default. - CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN --CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN -+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_hppa += - CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN -@@ -221,7 +221,7 @@ - # - # -L paths for finding and -ljava - # --LDFLAGS_OPT = -Xlinker -O1 -+LDFLAGS_OPT = $(OE_LDFLAGS) - LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) - LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) - -Index: openjdk/jdk/make/common/Defs-linux.gmk -=================================================================== ---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2009-01-24 17:54:57.000000000 +0100 -+++ openjdk/jdk/make/common/Defs-linux.gmk 2009-01-24 17:55:07.000000000 +0100 -@@ -92,9 +92,9 @@ - CC_NO_OPT = - - ifeq ($(PRODUCT), java) -- _OPT = $(CC_HIGHER_OPT) -+ _OPT = $(OE_CFLAGS) - else -- _OPT = $(CC_LOWER_OPT) -+ _OPT = $(OE_CFLAGS) - CPPFLAGS_DBG += -DLOGGING - endif - -@@ -104,7 +104,7 @@ - # as the default. - CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN --CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN -+CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_hppa += - CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN - CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN -@@ -231,7 +231,7 @@ - # - # -L paths for finding and -ljava - # --LDFLAGS_OPT = -Xlinker -O1 -+LDFLAGS_OPT = $(OE_LDFLAGS) - LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) - LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) - -Index: openjdk/hotspot/make/linux/makefiles/gcc.make -=================================================================== ---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:54:57.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2009-01-24 17:55:07.000000000 +0100 -@@ -119,7 +119,7 @@ - CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) - - # The flags to use for an Optimized g++ build --OPT_CFLAGS += -O3 -+OPT_CFLAGS += $(OE_CFLAGS) - - # Hotspot uses very unstrict aliasing turn this optimization off - OPT_CFLAGS += -fno-strict-aliasing -@@ -148,7 +148,7 @@ - endif - - # Enable linker optimization --LFLAGS += -Xlinker -O1 -+LFLAGS += $(OE_LDFLAGS) - - # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. - MAPFLAG = -Xlinker --version-script=FILENAME -Index: openjdk/hotspot/make/linux/makefiles/launcher.make -=================================================================== ---- openjdk.orig/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:55:19.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/launcher.make 2009-01-24 17:56:05.000000000 +0100 -@@ -44,7 +44,7 @@ - LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) - else - LAUNCHER.o = launcher.o -- LFLAGS_LAUNCHER += -L `pwd` -+ LFLAGS_LAUNCHER += -L `pwd` $(OE_LAUNCHER_LDFLAGS) $(OE_LDFLAGS) - LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ - endif - -Index: icedtea6-1.8.5/build/openjdk/jdk/make/sun/xawt/Makefile -=================================================================== ---- openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:17:03.926207269 +0100 -+++ openjdk/jdk/make/sun/xawt/Makefile 2011-03-14 14:30:11.956186631 +0100 -@@ -245,7 +245,7 @@ - $(CHMOD) +w $@;\ - else \ - $(ECHO) GENERATING $@; \ -- $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ -+ $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ - fi - @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ - $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ -diff --git openjdk/jdk/make/launchers/Makefile.launcher openjdk/jdk/make/launchers/Makefile.launcher -index f59a9d6..6edc880 100644 ---- openjdk/jdk/make/launchers/Makefile.launcher -+++ openjdk/jdk/make/launchers/Makefile.launcher -@@ -152,7 +152,7 @@ endif - ifeq ($(GUI_TOOL),true) - ifneq ($(PLATFORM), windows) - # Anything with a GUI needs X11 to be linked in. -- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -+ OTHER_LDLIBS += -lX11 - endif - endif - -diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile -index 2021434..9035da7 100644 ---- openjdk/jdk/make/sun/jawt/Makefile -+++ openjdk/jdk/make/sun/jawt/Makefile -@@ -98,8 +98,7 @@ else # PLATFORM - # - # Other extra flags needed for compiling. - # --CPPFLAGS += -I$(OPENWIN_HOME)/include \ -- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ -+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ - -I$(SHARE_SRC)/native/$(PKGDIR)/image \ - -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \ - -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \ -diff --git openjdk/jdk/make/sun/splashscreen/Makefile openjdk/jdk/make/sun/splashscreen/Makefile -index 6693e2a..58d05f1 100644 ---- openjdk/jdk/make/sun/splashscreen/Makefile -+++ openjdk/jdk/make/sun/splashscreen/Makefile -@@ -63,8 +63,7 @@ CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE - - ifneq ($(PLATFORM), windows) - CFLAGS += -DWITH_X11 -- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions -- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread -+ OTHER_LDLIBS += -lX11 -lXext $(LIBM) -lpng -ljpeg -lgif -lz -lpthread - else # PLATFORM - CFLAGS += -DWITH_WIN32 - OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib -diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile -index 440699b..ffa177d 100644 ---- openjdk/jdk/make/sun/xawt/Makefile -+++ openjdk/jdk/make/sun/xawt/Makefile -@@ -46,8 +46,6 @@ include FILES_export_unix.gmk - AUTO_FILES_JAVA_DIRS = sun/awt/X11 - AUTO_JAVA_PRUNE = WrapperGenerator.java - --LDFLAGS += -L$(OPENWIN_LIB) -- - # For Xrender extension. - ifeq ($(PLATFORM), solaris) - 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 @@ -Index: openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c -=================================================================== ---- openjdk.orig/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 2011-10-19 16:56:03.014276748 +0200 -+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c 2011-10-19 16:57:19.942658211 +0200 -@@ -29,7 +29,7 @@ - #include "X11SurfaceData.h" - - /*#include */ --#include -+#include - - #ifndef RepeatNone /* added in 0.10 */ - #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 @@ -Index: openjdk/hotspot/make/linux/makefiles/rules.make -=================================================================== ---- openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:22:33.201668748 +0100 -+++ openjdk/hotspot/make/linux/makefiles/rules.make 2010-02-02 02:23:08.480415783 +0100 -@@ -39,6 +39,7 @@ - # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++). - C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) - CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) -+CC_HOST_COMPILE = $(BUILD_CC) $(CPPFLAGS) $(CFLAGS) - - AS.S = $(AS) $(ASFLAGS) - 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 @@ -Index: openjdk/hotspot/src/os/linux/vm/os_linux.cpp -=================================================================== ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-12-20 19:15:05.000000000 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-12-20 19:18:22.411503442 +0100 -@@ -2593,10 +2593,7 @@ - // If we are running with earlier version, which did not have symbol versions, - // we should use the base version. - void* os::Linux::libnuma_dlsym(void* handle, const char *name) { -- void *f = dlvsym(handle, name, "libnuma_1.1"); -- if (f == NULL) { -- f = dlsym(handle, name); -- } -+ void *f = dlsym(handle, name); - return f; - } - 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 @@ -Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp -=================================================================== ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:22:13.696298239 +0200 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:24:15.308790737 +0200 -@@ -49,7 +49,6 @@ - # include - # include - # include --# include - # include - # include - # include -@@ -544,9 +543,7 @@ - os::Linux::set_glibc_version(str); - } else { - // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version() -- static char _gnu_libc_version[32]; -- jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version), -- "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release()); -+ static char _gnu_libc_version[32] = "2.9"; - os::Linux::set_glibc_version(_gnu_libc_version); - } - 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 @@ -Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp -=================================================================== ---- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:28.576131825 +0200 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:41:55.555711815 +0200 -@@ -235,8 +235,8 @@ - - // Checking for finiteness - --inline int g_isfinite(jfloat f) { return finite(f); } --inline int g_isfinite(jdouble f) { return finite(f); } -+inline int g_isfinite(jfloat f) { return isfinite(f); } -+inline int g_isfinite(jdouble f) { return isfinite(f); } - - - // 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 @@ -Index: icedtea6-1.8/build/openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp -=================================================================== ---- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:47:12.695674808 +0200 -+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-06-09 21:48:08.699007491 +0200 -@@ -220,14 +220,14 @@ - // checking for nanness - #ifdef SOLARIS - #ifdef SPARC --inline int g_isnan(float f) { return isnanf(f); } -+inline int g_isnan(float f) { return __isnanf(f); } - #else - // isnanf() broken on Intel Solaris use isnand() - inline int g_isnan(float f) { return isnand(f); } - #endif - inline int g_isnan(double f) { return isnand(f); } - #elif LINUX --inline int g_isnan(float f) { return isnanf(f); } -+inline int g_isnan(float f) { return __isnanf(f); } - inline int g_isnan(double f) { return isnan(f); } - #else - #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 @@ -Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp -=================================================================== ---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:16:09.406334411 +0200 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:19:38.952152043 +0200 -@@ -4325,7 +4325,22 @@ - // Linux doesn't yet have a (official) notion of processor sets, - // so just return the system wide load average. - int os::loadavg(double loadavg[], int nelem) { -- return ::getloadavg(loadavg, nelem); -+ -+ FILE *LOADAVG; -+ double avg[3] = { 0.0, 0.0, 0.0 }; -+ int i, res = -1;; -+ -+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) { -+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]); -+ res = 0; -+ fclose(LOADAVG); -+ } -+ -+ for (i = 0; (i < nelem) && (i < 3); i++) { -+ loadavg[i] = avg[i]; -+ } -+ -+ return res; - } - - 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 @@ -Index: openjdk/jdk/make/java/npt/Makefile -=================================================================== ---- openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:02.598512448 +0200 -+++ openjdk/jdk/make/java/npt/Makefile 2010-06-13 15:11:28.504759286 +0200 -@@ -65,6 +65,8 @@ - # We don't want to link against -ljava - JAVALIB= - -+LDLIBS += -liconv -+ - # Add -export options to explicitly spell exported symbols - ifeq ($(PLATFORM), windows) - OTHER_LCF += -export:nptInitialize -export:nptTerminate -Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile -=================================================================== ---- openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:14.688505195 +0200 -+++ openjdk/jdk/make/java/instrument/Makefile 2010-06-13 15:12:32.641425670 +0200 -@@ -123,6 +123,8 @@ - # We don't want to link against -ljava - JAVALIB= - -+LDLIBS += -liconv -+ - # - # Add to ambient vpath so we pick up the library files - # -Index: openjdk/jdk/make/sun/splashscreen/Makefile -=================================================================== ---- openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:12:48.951840824 +0200 -+++ openjdk/jdk/make/sun/splashscreen/Makefile 2010-06-13 15:13:01.191422891 +0200 -@@ -55,6 +55,8 @@ - - JAVALIB= - -+LDLIBS += -liconv -+ - # - # C Flags - # 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 @@ -http://mail.openjdk.java.net/pipermail/zero-dev/2010-June/000346.html - -this cute C code does the same thing on powerpc as the assembly code that -was here before. If the compiler was built with the SPE extensions instead -of traditional FPU and double operations are performed in HW then we are -one step further: The compiler turns this into evldd & evstdd. Voila :) - -This C code could also be activated on s390. The compiler turns this into -a single mvc instruction which does the copy operation. I don't know if -mvc's copy ability is atomic _or_ not and therefore I leave it as it. - -Signed-off-by: Sebastian Andrzej Siewior - -./openjdk-src-dir/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp -Index: openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp -=================================================================== ---- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp.org 2011-11-14 14:07:32.000000000 -0800 -+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2012-07-19 07:28:26.208405923 -0700 -@@ -25,6 +25,16 @@ - - #ifndef OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP - #define OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP -+#if defined(PPC) && !defined(_LP64) -+ -+#ifndef __NO_FPRS__ -+#define ATOMIC64_COPY_THROUGH_DOUBLE 1 -+ -+#elif defined(__SPE__) && !defined(_SOFT_DOUBLE) -+#define ATOMIC64_COPY_THROUGH_DOUBLE 1 -+ -+#endif -+#endif - - static void setup_fpu() {} - -@@ -36,12 +46,23 @@ - - // Atomically copy 64 bits of data - static void atomic_copy64(volatile void *src, volatile void *dst) { --#if defined(PPC) && !defined(_LP64) -- double tmp; -- asm volatile ("lfd %0, 0(%1)\n" -- "stfd %0, 0(%2)\n" -- : "=f"(tmp) -- : "b"(src), "b"(dst)); -+#if ATOMIC64_COPY_THROUGH_DOUBLE -+ /* -+ * In order to copy 8 bytes atomicly we rely on the trick that some -+ * architectures can load and store a double as a single operation. -+ * gcc picks the correct opcode here and with optimization turned on -+ * all temporary assignments are gone. - bigeasy -+ */ -+ union { -+ double *d; -+ volatile void *v; -+ } s, d; -+ -+ s.v = src; -+ d.v = dst; -+ -+ *d.d = *s.d; -+ - #elif defined(S390) && !defined(_LP64) - double tmp; - 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 @@ -Index: openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c -=================================================================== ---- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:45:56.607257503 +0200 -+++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c 2010-08-05 16:47:19.727254686 +0200 -@@ -27,9 +27,6 @@ - #include - #include - #include --#ifdef __linux__ --#include --#endif - - #include - #include -@@ -689,26 +686,6 @@ - return ret; - } - --#ifdef __linux__ --void print_stack(void) --{ -- void *array[10]; -- size_t size; -- char **strings; -- size_t i; -- -- size = backtrace (array, 10); -- strings = backtrace_symbols (array, size); -- -- fprintf (stderr, "Obtained %zd stack frames.\n", size); -- -- for (i = 0; i < size; i++) -- fprintf (stderr, "%s\n", strings[i]); -- -- free (strings); --} --#endif -- - Window get_xawt_root_shell(JNIEnv *env) { - static jclass classXRootWindow = NULL; - 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 @@ -diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile -index bdc1f8f..76f0c00 100644 ---- openjdk/jdk/make/com/sun/jmx/Makefile -+++ openjdk/jdk/make/com/sun/jmx/Makefile -@@ -102,7 +102,7 @@ FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/ - # when available, we need to run with latest rmic version available. rmic - # launch tool not built at this stage but we can invoke via rmi class. - --RMIC_JAVA = $(OUTPUTDIR)/bin/java -+RMIC_JAVA = $(BOOTDIR)/bin/java - # need to treat 64bit solaris differently - ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) - 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 @@ -Disable xawt and jawt along with sizes generation which does not work well if -you cant generated sizes in cross env. So for architectures which dont have -working qemu this is an option - -Signed-off-by: Khem Raj -Upstream-Status: Inappropriate [Cross-compile specific hack] - ---- openjdk/jdk/make/sun/xawt/Makefile.khem 2012-07-21 23:54:47.396405922 -0700 -+++ openjdk/jdk/make/sun/xawt/Makefile 2012-07-21 23:55:52.032405922 -0700 -@@ -245,18 +245,19 @@ - $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) - - $(SIZES): $(SIZERS) -- @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ -- $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ -- $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ -- $(CHMOD) +w $@;\ -- else \ -- $(ECHO) GENERATING $@; \ -- $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ -- fi -- @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ -- $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ -- $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ -- fi -+ touch $(SIZES) -+# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ -+# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ -+# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ -+# $(CHMOD) +w $@;\ -+# else \ -+# $(ECHO) GENERATING $@; \ -+# $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ -+# fi -+# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ -+# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ -+# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ -+# fi - - $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) - $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ ---- openjdk/jdk/make/sun/Makefile.khem 2011-11-14 14:11:40.000000000 -0800 -+++ openjdk/jdk/make/sun/Makefile 2012-07-22 00:42:04.980409296 -0700 -@@ -50,7 +50,7 @@ - MOTIF_SUBDIRS = motif12 motif21 - endif - HEADLESS_SUBDIR = headless -- XAWT_SUBDIR = xawt -+ XAWT_SUBDIR = - endif - - ifndef OPENJDK -@@ -65,7 +65,7 @@ - awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \ - $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ - font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ -- jawt text nio launcher management $(ORG_SUBDIR) \ -+ text nio launcher management $(ORG_SUBDIR) \ - native2ascii serialver tools jconsole - - 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 @@ -Index: openjdk/jdk/make/com/sun/java/pack/Makefile -=================================================================== ---- openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:21.548426411 +0200 -+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2010-06-13 15:25:43.858007543 +0200 -@@ -103,6 +103,7 @@ - OTHER_LDLIBS += $(LIBCXX) -lc - # setup the list of libraries to link in... - ifeq ($(PLATFORM), linux) -+ OTHER_LDLIBS += -lpthread - ifeq ("$(CC_VER_MAJOR)", "3") - OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic - 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 @@ -Index: openjdk/hotspot/make/linux/makefiles/launcher.make -=================================================================== ---- openjdk/hotspot/make/linux/makefiles/launcher.make 2011-12-20 10:33:37.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/launcher.make 2011-12-20 10:37:54.055022618 +0100 -@@ -51,7 +51,7 @@ - else - LAUNCHER.o = launcher.o - LFLAGS_LAUNCHER += -L `pwd` -- LIBS_LAUNCHER += -l$(JVM) $(LIBS) -+ LIBS_LAUNCHER += -l$(JVM) $(LIBS) -lstdc++ - ifeq ($(SHARK_BUILD), true) - LFLAGS_LAUNCHER += $(LLVM_LDFLAGS) - 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 @@ -Index: openjdk/jdk/make/java/net/Makefile -=================================================================== ---- openjdk/jdk/make/java/net/Makefile 2010-07-05 12:28:58.476625401 +0200 -+++ openjdk/jdk/make/java/net/Makefile 2010-07-05 12:29:11.876625138 +0200 -@@ -25,7 +25,7 @@ - - BUILDDIR = ../.. - PACKAGE = java.net --LIBRARY = net -+LIBRARY = javanet - PRODUCT = sun - include $(BUILDDIR)/common/Defs.gmk - -Index: openjdk/jdk/make/java/nio/Makefile -=================================================================== ---- openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:31:27.046626250 +0200 -+++ openjdk/jdk/make/java/nio/Makefile 2010-07-05 12:32:06.647874890 +0200 -@@ -139,11 +139,11 @@ - endif - ifeq ($(PLATFORM), linux) - COMPILER_WARNINGS_FATAL=true --OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl -+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl - endif - ifeq ($(PLATFORM), solaris) - OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \ -- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -+ -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet - endif # PLATFORM - - # -Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java -=================================================================== ---- openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:40:56.467876415 +0200 -+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java 2010-07-05 17:41:43.326628410 +0200 -@@ -58,7 +58,7 @@ - */ - static { - java.security.AccessController.doPrivileged( -- new sun.security.action.LoadLibraryAction("net")); -+ new sun.security.action.LoadLibraryAction("javanet")); - } - - /** -Index: openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java -=================================================================== ---- openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:01.027875484 +0200 -+++ openjdk/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java 2010-07-05 17:41:56.826626386 +0200 -@@ -74,7 +74,7 @@ - */ - static { - java.security.AccessController.doPrivileged( -- new sun.security.action.LoadLibraryAction("net")); -+ new sun.security.action.LoadLibraryAction("javanet")); - } - - /** -Index: openjdk/jdk/src/share/classes/java/net/DatagramPacket.java -=================================================================== ---- openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:41:02.017875980 +0200 -+++ openjdk/jdk/src/share/classes/java/net/DatagramPacket.java 2010-07-05 17:42:06.057875677 +0200 -@@ -47,7 +47,7 @@ - */ - static { - java.security.AccessController.doPrivileged( -- new sun.security.action.LoadLibraryAction("net")); -+ new sun.security.action.LoadLibraryAction("javanet")); - init(); - } - -Index: openjdk/jdk/src/share/classes/java/net/InetAddress.java -=================================================================== ---- openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:41:02.756626429 +0200 -+++ openjdk/jdk/src/share/classes/java/net/InetAddress.java 2010-07-05 17:42:15.997875786 +0200 -@@ -230,7 +230,7 @@ - static { - preferIPv6Address = java.security.AccessController.doPrivileged( - new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue(); -- AccessController.doPrivileged(new LoadLibraryAction("net")); -+ AccessController.doPrivileged(new LoadLibraryAction("javanet")); - init(); - } - -Index: openjdk/jdk/src/share/classes/java/net/NetworkInterface.java -=================================================================== ---- openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:41:03.547875282 +0200 -+++ openjdk/jdk/src/share/classes/java/net/NetworkInterface.java 2010-07-05 17:42:22.647875475 +0200 -@@ -52,7 +52,7 @@ - private boolean virtual = false; - - static { -- AccessController.doPrivileged(new LoadLibraryAction("net")); -+ AccessController.doPrivileged(new LoadLibraryAction("javanet")); - init(); - } - -Index: openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java -=================================================================== ---- openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:41:04.306628153 +0200 -+++ openjdk/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java 2010-07-05 17:42:32.666627264 +0200 -@@ -89,7 +89,7 @@ - }}); - if (b != null && b.booleanValue()) { - java.security.AccessController.doPrivileged( -- new sun.security.action.LoadLibraryAction("net")); -+ new sun.security.action.LoadLibraryAction("javanet")); - hasSystemProxies = init(); - } - } -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 -=================================================================== ---- openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:41:05.086626745 +0200 -+++ openjdk/jdk/src/share/classes/sun/nio/ch/Util.java 2010-07-05 17:42:39.266626410 +0200 -@@ -354,7 +354,7 @@ - return; - loaded = true; - java.security.AccessController -- .doPrivileged(new sun.security.action.LoadLibraryAction("net")); -+ .doPrivileged(new sun.security.action.LoadLibraryAction("javanet")); - java.security.AccessController - .doPrivileged(new sun.security.action.LoadLibraryAction("nio")); - // IOUtil must be initialized; Its native methods are called from -Index: openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java -=================================================================== ---- openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:05.896626691 +0200 -+++ openjdk/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:45.606625991 +0200 -@@ -244,7 +244,7 @@ - - static { - java.security.AccessController.doPrivileged( -- new sun.security.action.LoadLibraryAction("net")); -+ new sun.security.action.LoadLibraryAction("javanet")); - } - - } -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 -=================================================================== ---- openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:41:06.786627210 +0200 -+++ openjdk/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2010-07-05 17:42:51.926627747 +0200 -@@ -160,7 +160,7 @@ - - static { - java.security.AccessController.doPrivileged( -- new sun.security.action.LoadLibraryAction("net")); -+ new sun.security.action.LoadLibraryAction("javanet")); - init0(); - - // 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 @@ -Index: openjdk/hotspot/make/linux/makefiles/gcc.make -=================================================================== ---- openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:35.758533706 +0100 -+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2010-02-02 16:11:42.761456458 +0100 -@@ -98,9 +98,6 @@ - CFLAGS += -pipe - endif - --# Compiler warnings are treated as errors --WARNINGS_ARE_ERRORS = -Werror -- - # Except for a few acceptable ones - # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit - # 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 @@ -Index: openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp -=================================================================== ---- openjdk.orig/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:42:48.412103129 +0200 -+++ openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp 2010-07-14 16:50:51.680282178 +0200 -@@ -32,6 +32,96 @@ - - #if SHARK_LLVM_VERSION >= 27 - namespace { -+ -+#if defined(__arm__) && defined(__linux__) -+#include -+#include -+#include -+#define VECBUFF_SIZE 32 -+ -+bool TestARMLinuxHWCAP(int feature) { -+ int fd; -+ unsigned vecs[VECBUFF_SIZE]; -+ unsigned *p; -+ int i, n; -+ int rc; -+ -+ rc = 0; -+ fd = open("/proc/self/auxv", O_RDONLY); -+ if (fd < 0) return 0; -+ do { -+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned)); -+ p = vecs; -+ i = n/8; -+ while (--i >=0) { -+ unsigned tag = *p++; -+ unsigned value = *p++; -+ if (tag == 0) goto fini; -+ if(tag == AT_HWCAP && (value & feature)) { -+ rc = 1; -+ goto fini; -+ } -+ } -+ } while (n == VECBUFF_SIZE * sizeof(unsigned)); -+fini: -+ close(fd); -+ return rc; -+} -+ -+char* TestARMLinuxAT(int auxvec) { -+ int fd; -+ unsigned vecs[VECBUFF_SIZE]; -+ unsigned *p; -+ int i, n; -+ char* rc; -+ -+ rc = 0; -+ fd = open("/proc/self/auxv", O_RDONLY); -+ if (fd < 0) return 0; -+ do { -+ n = read(fd, vecs, VECBUFF_SIZE * sizeof(unsigned)); -+ p = vecs; -+ i = n/8; -+ while (--i >=0) { -+ unsigned tag = *p++; -+ unsigned value = *p++; -+ if (tag == 0) goto fini; -+ if(tag == (unsigned) auxvec ) { -+ rc = (char*)value; -+ goto fini; -+ } -+ } -+ } while (n == VECBUFF_SIZE * sizeof(unsigned)); -+fini: -+ close(fd); -+ return rc; -+} -+ -+bool getARMHostCPUFeatures(StringMap &Features) { -+ // FIXME LLVM PR6561 // Features["neon"]=TestARMLinuxHWCAP(HWCAP_NEON); -+ Features["thumb2"]=TestARMLinuxHWCAP(HWCAP_THUMBEE); -+ Features["vfp2"]=TestARMLinuxHWCAP(HWCAP_VFP); -+ -+ std::string testArchKey(TestARMLinuxAT(AT_PLATFORM)); -+ -+ StringMap archLinuxToLLVMMap; -+ archLinuxToLLVMMap["v4l"]="v4t"; -+ archLinuxToLLVMMap["v5l"]="v5t"; -+ archLinuxToLLVMMap["v6l"]="v6"; -+ // FIXME change this from v6 to v7a when LLVM PR7048 have been fixed -+ archLinuxToLLVMMap["v7l"]="v6"; -+ -+ llvm::StringMapIterator resultIterator(archLinuxToLLVMMap.find( -+ testArchKey)); -+ if(resultIterator->first()) { -+ std::string arch(resultIterator->second); -+ Features[arch]=true; -+ } -+ -+ return true; -+} -+#endif -+ - cl::opt - MCPU("mcpu"); - -@@ -64,7 +154,11 @@ - #if SHARK_LLVM_VERSION >= 27 - // Finetune LLVM for the current host CPU. - StringMap Features; -+#if defined(__arm__) && defined(__linux__) -+ bool gotCpuFeatures = getARMHostCPUFeatures(Features); -+#else - bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features); -+#endif - std::string cpu("-mcpu=" + llvm::sys::getHostCPUName()); - - std::vector 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 @@ -Index: openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h -=================================================================== ---- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:49:39.972718207 +0100 -+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-02-02 13:50:04.635639302 +0100 -@@ -27,13 +27,11 @@ - - #include "jfdlibm.h" - --#ifdef __NEWVALID /* special setup for Sun test regime */ - #if defined(i386) || defined(i486) || \ - defined(intel) || defined(x86) || \ - defined(i86pc) || defined(_M_IA64) || defined(ia64) - #define _LITTLE_ENDIAN - #endif --#endif - - #ifdef _LITTLE_ENDIAN - #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 @@ -Index: openjdk/hotspot/make/linux/makefiles/zeroshark.make -=================================================================== ---- openjdk/hotspot/make/linux/makefiles/zeroshark.make 2011-12-20 18:24:38.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/zeroshark.make 2011-12-20 18:31:22.584884637 +0100 -@@ -32,13 +32,20 @@ - Obj_Files += thumb2.o - - CFLAGS += -DHOTSPOT_ASM -+CCFLAGS += -DHOTSPOT_ASM -+ -+ifeq ($(CROSS_COMPILATION), true) -+ C_COMPILE_FOR_MKBC = $(CC_FOR_BUILD) -+else -+ C_COMPILE_FOR_MKBC = $(C_COMPILE) -+endif - - cppInterpreter_arm.o: offsets_arm.s bytecodes_arm.s - thumb2.o: offsets_arm.s - - offsets_arm.s: mkoffsets - @echo Generating assembler offsets -- ./mkoffsets > $@ -+ $(QEMU) ./mkoffsets > $@ - - bytecodes_arm.s: bytecodes_arm.def mkbc - @echo Generatine ARM assembler bytecode sequences -@@ -46,12 +53,12 @@ - - mkbc: $(GAMMADIR)/tools/mkbc.c - @echo Compiling mkbc tool -- $(CC_COMPILE) -o $@ $< $(COMPILE_DONE) -+ $(C_COMPILE_FOR_MKBC) -o $@ $< $(COMPILE_DONE) - - mkoffsets: asm_helper.cpp - @echo Compiling offset generator - $(QUIETLY) $(REMOVE_TARGET) -- $(CC_COMPILE) -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) -+ $(CC_COMPILE) -static -fuse-ld=bfd -DSTATIC_OFFSETS -o $@ $< $(COMPILE_DONE) - - endif - 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 @@ -# Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Sun designates this -# particular file as subject to the "Classpath" exception as provided -# by Sun in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -# CA 95054 USA or visit www.sun.com if you need additional information or -# have any questions. -# -# -# List of JVMs that can be used as an option to java, javac, etc. -# Order is important -- first in this list is the default JVM. -# NOTE that this both this file and its format are UNSUPPORTED and -# WILL GO AWAY in a future release. -# -# You may also select a JVM in an arbitrary location with the -# "-XXaltjvm=" option, but that too is unsupported -# and may not be available in a future release. -# --server ERROR --client IGNORE --hotspot ERROR --classic WARN --native ERROR --green ERROR --zero ALIASED_TO -server --shark ERROR --cacao ERROR --jamvm ERROR -- cgit v1.2.3-54-g00ecf