/hg/icedtea7: Update to icedtea-2.5pre02.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Feb 20 07:11:26 PST 2014
changeset 6a756a2b18c7 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=6a756a2b18c7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Feb 20 15:10:15 2014 +0000
Update to icedtea-2.5pre02.
2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/boot/test_gamma.patch,
* patches/pax-mark-rmic-java.patch,
* patches/test_gamma.patch:
Removed.
* INSTALL:
Document ARM32 JIT and --enable-arm32-jit option.
* Makefile.am:
(CORBA_CHANGESET): Update to icedtea-2.5pre02 tag.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Remove PaX patches.
(ICEDTEA_BOOT_PATCHES): Remove test_gamma
patch (fixed by detection of non-Oracle JDK
addition from PPC port)
(ARM32JIT_STATUS): Set based on ENABLE_ARM32JIT.
(ICEDTEA_ENV): Pass ARM32JIT and PAX_COMMAND to
OpenJDK build.
* NEWS: Move backports and bug fixes common to
all archs above PPC items. Updated with PaX and
ARM changes.
* acinclude.m4:
(IT_ENABLE_ARM32JIT): Allow the ARM32 JIT to be
enabled.
* configure.ac: Bump to 2.5pre02. Run
IT_ENABLE_ARM32JIT macro.
* hotspot.map: Update to icedtea-2.5pre02 tag.
diffstat:
ChangeLog | 38 ++++++++++++++++++
INSTALL | 5 ++
Makefile.am | 44 ++++++++++-----------
NEWS | 81 ++++++++++++++++++++-------------------
acinclude.m4 | 22 ++++++++++
configure.ac | 3 +-
hotspot.map | 2 +-
patches/boot/test_gamma.patch | 47 -----------------------
patches/pax-mark-rmic-java.patch | 10 ----
patches/test_gamma.patch | 47 -----------------------
10 files changed, 131 insertions(+), 168 deletions(-)
diffs (417 lines):
diff -r ec3cd225cbec -r 6a756a2b18c7 ChangeLog
--- a/ChangeLog Wed Feb 19 18:18:22 2014 +0000
+++ b/ChangeLog Thu Feb 20 15:10:15 2014 +0000
@@ -1,3 +1,41 @@
+2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/boot/test_gamma.patch,
+ * patches/pax-mark-rmic-java.patch,
+ * patches/test_gamma.patch:
+ Removed.
+ * INSTALL:
+ Document ARM32 JIT and --enable-arm32-jit option.
+ * Makefile.am:
+ (CORBA_CHANGESET): Update to icedtea-2.5pre02 tag.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Remove PaX patches.
+ (ICEDTEA_BOOT_PATCHES): Remove test_gamma
+ patch (fixed by detection of non-Oracle JDK
+ addition from PPC port)
+ (ARM32JIT_STATUS): Set based on ENABLE_ARM32JIT.
+ (ICEDTEA_ENV): Pass ARM32JIT and PAX_COMMAND to
+ OpenJDK build.
+ * NEWS: Move backports and bug fixes common to
+ all archs above PPC items. Updated with PaX and
+ ARM changes.
+ * acinclude.m4:
+ (IT_ENABLE_ARM32JIT): Allow the ARM32 JIT to be
+ enabled.
+ * configure.ac: Bump to 2.5pre02. Run
+ IT_ENABLE_ARM32JIT macro.
+ * hotspot.map: Update to icedtea-2.5pre02 tag.
+
2014-02-19 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1677: Update PaX support to detect running PaX
diff -r ec3cd225cbec -r 6a756a2b18c7 INSTALL
--- a/INSTALL Wed Feb 19 18:18:22 2014 +0000
+++ b/INSTALL Thu Feb 20 15:10:15 2014 +0000
@@ -206,6 +206,7 @@
* --enable-system-kerberos: Link against the system Kerberos library and
query it at runtime to obtain the cache location, rather than using a
hardcoded value.
+* --enable-arm32-jit: Build the ARM32 JIT.
Testing
=======
@@ -303,6 +304,10 @@
--enable-shark to configure. Please note that Shark is still in
development and builds are still likely to fail at present.
+On ARM32, there is also a native JIT port built on top of Zero. This
+still has issues and is thus not enabled by default. To enable it,
+pass --enable-arm32-jit to configure.
+
Support for Different Versions of HotSpot
=========================================
diff -r ec3cd225cbec -r 6a756a2b18c7 Makefile.am
--- a/Makefile.am Wed Feb 19 18:18:22 2014 +0000
+++ b/Makefile.am Thu Feb 20 15:10:15 2014 +0000
@@ -4,19 +4,19 @@
BUILD_VERSION = b03
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 47343904e95d
-JAXP_CHANGESET = 74093b75ddd4
-JAXWS_CHANGESET = 3f7212cae6eb
-JDK_CHANGESET = 7d5b758810c2
-LANGTOOLS_CHANGESET = 0d89cc5766d7
-OPENJDK_CHANGESET = ba9872fc05cc
+CORBA_CHANGESET = 16906c5a09da
+JAXP_CHANGESET = d7085aad637f
+JAXWS_CHANGESET = 4aeccc3040fa
+JDK_CHANGESET = 3162252ff26b
+LANGTOOLS_CHANGESET = f75a642c2913
+OPENJDK_CHANGESET = fc5d15cc35b4
-CORBA_SHA256SUM = 78298de3f81eab8c6875f802d76789ad615920a4278f5665eea79045ee0da638
-JAXP_SHA256SUM = 5fc990186c57ed95ad3f9fb4783e874085f1fc624afb81899354c0df04cad73e
-JAXWS_SHA256SUM = d31d69e23ccf362c569d714d3ba10236e5c2735ec1b156cdba75359b3f1e9e51
-JDK_SHA256SUM = 6c9615bad9788034df920514437ccfca7db44e06761cfc2b21d367f55938bcb2
-LANGTOOLS_SHA256SUM = b1ffddcca4bf3a68b95a410002235d062469362193aadf2b886e9a06092a8d35
-OPENJDK_SHA256SUM = 0c451d9f107ac425d1b1d0f283f12a268ec1ec1e6d13d266a53723896d1cb578
+CORBA_SHA256SUM = 29dec824dd068c8ba89e9d079bc63e5c408ccc915118098381734495a0ef6610
+JAXP_SHA256SUM = 68540ee04cc159e4fb1dcc6f138242049fb870e907c4268b163039ad8ab5cae3
+JAXWS_SHA256SUM = 773022f057151aefb8c632670f0059e49a1e9b1d95a45e86e2450b0b5aaf6619
+JDK_SHA256SUM = 8680fd2a56dc388abaa9c3350d79f38f6638099406e81bc665d8f1a1f09273e5
+LANGTOOLS_SHA256SUM = 61363d33c482ead26951ba60eef75a2f8410178b2bed1eea012365cbf6f26ad4
+OPENJDK_SHA256SUM = 5f1548010cce513537e232609557d12ab854ff17d4fbaa83a830e1b3216fc0ee
CACAO_VERSION = e215e36be9fc
CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
@@ -297,12 +297,6 @@
ICEDTEA_PATCHES += patches/nss-config.patch
endif
-if WITH_PAX
-ICEDTEA_PATCHES += \
- patches/test_gamma.patch \
- patches/pax-mark-rmic-java.patch
-endif
-
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
@@ -350,10 +344,6 @@
patches/boot/xbootclasspath.patch
endif
-if !WITH_PAX
-ICEDTEA_BOOT_PATCHES += patches/boot/test_gamma.patch
-endif
-
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
endif
@@ -433,6 +423,12 @@
WERROR_STATUS=false
endif
+if ENABLE_ARM32JIT
+ARM32JIT_STATUS=true
+else
+ARM32JIT_STATUS=false
+endif
+
ICEDTEA_ENV = \
ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
ANT="$(ANT)" \
@@ -517,7 +513,9 @@
SYSTEM_PCSC="${ENABLE_SYSTEM_PCSC}" \
PCSC_LIBS="${PCSC_LIBS}" \
PCSC_CFLAGS="${PCSC_CFLAGS}" \
- COMPRESS_JARS="${ENABLE_JAR_COMPRESSION}"
+ COMPRESS_JARS="${ENABLE_JAR_COMPRESSION}" \
+ ARM32JIT="${ARM32JIT_STATUS}" \
+ PAX_COMMAND="${PAX_COMMAND}"
if ENABLE_CACAO
ICEDTEA_ENV += \
diff -r ec3cd225cbec -r 6a756a2b18c7 NEWS
--- a/NEWS Wed Feb 19 18:18:22 2014 +0000
+++ b/NEWS Thu Feb 20 15:10:15 2014 +0000
@@ -119,6 +119,46 @@
- S8030061: new hotspot build - hs24.60-b05
- S8030070: Test java/io/File/CheckPermission.java fails due to unfinished recursion (java.lang.StackOverflowError) when JIT'ed code (-client,-server) is running
- S8031787: Remove fix JDK-8026887 from 7u60
+* Backports
+ - S7103549: Remove dependencies on libjava and libjvm from security libraries
+ - S8000204: Memory leak in com/sun/security/auth/module/Unix.c
+ - S8000476: Memory Leaks and uninitialized memory access in PKCS11 and other native code
+ - S8001579: Cleanup warnings in security native code
+ - S8007607: security native code doesn't always use malloc, realloc, and calloc correctly
+ - S8008509: 6588413 changed JNIEXPORT visibility for GCC on HSX, jdk's jni_md.h needs similar change
+ - S8014307: Memory leak ... security/jgss/wrapper/GSSLibStub.c
+* Bug fixes
+ - Fix implicit function declarations
+ - PR1617: Include defs.make in vm.make so zeroshark.make is included
+ - Add Shark definitions from 8003868
+ - Drop compile_method argument removed in 7083786 from sharkCompiler.cpp
+ - Remove binary files and unlicensed generated files
+ - PR1655: Don't add IcedTea-Web jars to bootclasspath
+ - Enable CC_INTERP on ppc64
+ - Fix Zero following integration of PPC port
+ - PR1660: Allow use of system PCSC
+ - RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised fix)
+ - PR1659: OpenJDK 7 returns incorrect TrueType font metrics when bold style is set
+ - PR1661: Cleanup COMPILE_AGAINST_SYSCALLS option and allow it to be set false
+ - PR1661: Cleanup COMPRESS_JARS option and allow it to be set false
+ - PR1661: Cleanup SYSTEM_CUPS option and allow it to be set false
+ - PR1661: Cleanup SYSTEM_FONTCONFIG option and allow it to be set false
+ - PR1661: Cleanup SYSTEM_GIF option and allow it to be set false
+ - PR1661: Cleanup SYSTEM_GIO option and allow it to be set false
+ - PR1661: Cleanup SYSTEM_GTK option and allow it to be set false
+ - PR1661: Cleanup SYSTEM_JPEG option and allow it to be set false
+ - PR1661: Cleanup SYSTEM_LCMS option and allow it to be set false
+ - PR1661: Cleanup SYSTEM_PCSC option and allow it to be set false
+ - PR1661: Cleanup SYSTEM_PNG option and allow it to be set false
+ - PR1664: Ensure all SYSTEM_* options are in jdk_generic_profile.sh
+ - Link against $(LIBDL) if SYSTEM_CUPS is not true
+ - Only get CFLAGS/LIBS for libpcsclite if installed
+ - Add lost #endif
+ - Add new files from 8019229
+ - Remove duplicate ElfFuncDescTable code in elfSymbolTable.cpp
+ - Remove duplicate ElfFuncDescTable code in elfSymbolTable.hpp
+ - PR1677: Update PaX support to detect running PaX kernel and use newer tools
+ - PR1679: Allow OpenJDK to build on PaX-enabled kernels
* PPC & AIX port
- Add AIX-specific build instructions to README-ppc.html
- Added AIX as testing platform for more jtreg tests written in shell-script
@@ -338,45 +378,8 @@
- Use macosx's BsdVirtualMachine implementation to provide tools/attach on AIX platform.
- Use stubs to implement safefetch.
- Use the solaris' approach of doing IsXRenderAvailable check for AIX
-* Backports
- - S7103549: Remove dependencies on libjava and libjvm from security libraries
- - S8000204: Memory leak in com/sun/security/auth/module/Unix.c
- - S8000476: Memory Leaks and uninitialized memory access in PKCS11 and other native code
- - S8001579: Cleanup warnings in security native code
- - S8007607: security native code doesn't always use malloc, realloc, and calloc correctly
- - S8008509: 6588413 changed JNIEXPORT visibility for GCC on HSX, jdk's jni_md.h needs similar change
- - S8014307: Memory leak ... security/jgss/wrapper/GSSLibStub.c
-* Bug fixes
- - Fix implicit function declarations
- - PR1617: Include defs.make in vm.make so zeroshark.make is included
- - Add Shark definitions from 8003868
- - Drop compile_method argument removed in 7083786 from sharkCompiler.cpp
- - Remove binary files and unlicensed generated files
- - PR1655: Don't add IcedTea-Web jars to bootclasspath
- - Enable CC_INTERP on ppc64
- - Fix Zero following integration of PPC port
- - PR1660: Allow use of system PCSC
- - RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised fix)
- - PR1659: OpenJDK 7 returns incorrect TrueType font metrics when bold style is set
- - PR1661: Cleanup COMPILE_AGAINST_SYSCALLS option and allow it to be set false
- - PR1661: Cleanup COMPRESS_JARS option and allow it to be set false
- - PR1661: Cleanup SYSTEM_CUPS option and allow it to be set false
- - PR1661: Cleanup SYSTEM_FONTCONFIG option and allow it to be set false
- - PR1661: Cleanup SYSTEM_GIF option and allow it to be set false
- - PR1661: Cleanup SYSTEM_GIO option and allow it to be set false
- - PR1661: Cleanup SYSTEM_GTK option and allow it to be set false
- - PR1661: Cleanup SYSTEM_JPEG option and allow it to be set false
- - PR1661: Cleanup SYSTEM_LCMS option and allow it to be set false
- - PR1661: Cleanup SYSTEM_PCSC option and allow it to be set false
- - PR1661: Cleanup SYSTEM_PNG option and allow it to be set false
- - PR1664: Ensure all SYSTEM_* options are in jdk_generic_profile.sh
- - Link against $(LIBDL) if SYSTEM_CUPS is not true
- - Only get CFLAGS/LIBS for libpcsclite if installed
- - Add lost #endif
- - Add new files from 8019229
- - Remove duplicate ElfFuncDescTable code in elfSymbolTable.cpp
- - Remove duplicate ElfFuncDescTable code in elfSymbolTable.hpp
- - PR1677: Update PaX support to detect running PaX kernel and use newer tools
+* ARM port
+ - ARM32 assembler update for hsx24. Use ARM32JIT to turn it on/off.
* JamVM
- JVM_NewMultiArray: element class may be an array
- jtreg test java/lang/reflect/Array/ExceedMaxDim
diff -r ec3cd225cbec -r 6a756a2b18c7 acinclude.m4
--- a/acinclude.m4 Wed Feb 19 18:18:22 2014 +0000
+++ b/acinclude.m4 Thu Feb 20 15:10:15 2014 +0000
@@ -2655,3 +2655,25 @@
AC_PROVIDE([$0])dnl
AM_CONDITIONAL([VM_SUPPORTS_XBOOTCLASSPATH], test x"${it_cv_xbootclasspath_works}" = "xyes")
])
+
+AC_DEFUN([IT_ENABLE_ARM32JIT],
+[
+ AC_MSG_CHECKING([whether to enable the ARM32 JIT])
+ AC_ARG_ENABLE([arm32-jit],
+ [AS_HELP_STRING(--enable-arm32-jit,build with the ARM32 JIT [[default=no]])],
+ [
+ case "${enableval}" in
+ yes)
+ enable_arm32jit=yes
+ ;;
+ *)
+ enable_arm32jit=no
+ ;;
+ esac
+ ],
+ [
+ enable_arm32jit=no
+ ])
+ AC_MSG_RESULT([$enable_arm32jit])
+ AM_CONDITIONAL([ENABLE_ARM32JIT], test x"${enable_arm32jit}" = "xyes")
+])
diff -r ec3cd225cbec -r 6a756a2b18c7 configure.ac
--- a/configure.ac Wed Feb 19 18:18:22 2014 +0000
+++ b/configure.ac Thu Feb 20 15:10:15 2014 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.5pre02], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
@@ -175,6 +175,7 @@
IT_ENABLE_WERROR
IT_ENABLE_JAR_COMPRESSION
IT_CHECK_ADDITIONAL_VMS
+IT_ENABLE_ARM32JIT
IT_WITH_VERSION_SUFFIX
IT_WITH_PROJECT
diff -r ec3cd225cbec -r 6a756a2b18c7 hotspot.map
--- a/hotspot.map Wed Feb 19 18:18:22 2014 +0000
+++ b/hotspot.map Thu Feb 20 15:10:15 2014 +0000
@@ -1,2 +1,2 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot bc178be7e9d6 6811d400c0922adc78a7859f1b3e208889f0b4e3f7c4772379070ae7f11516f1
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot f30e87f16d90 871fa08b8e9d7a2958cee844f940752c39b1946146dc382c005269e86b687a49
diff -r ec3cd225cbec -r 6a756a2b18c7 patches/boot/test_gamma.patch
--- a/patches/boot/test_gamma.patch Wed Feb 19 18:18:22 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile openjdk-boot/hotspot/make/linux/Makefile
---- ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile 2009-10-30 17:37:07.000000000 +0000
-+++ openjdk-boot/hotspot/make/linux/Makefile 2009-10-30 17:45:40.000000000 +0000
-@@ -287,42 +287,36 @@
-
- $(TARGETS_C2): $(SUBDIRS_C2)
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_TIERED): $(SUBDIRS_TIERED)
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_C1): $(SUBDIRS_C1)
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_CORE): $(SUBDIRS_CORE)
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_ZERO): $(SUBDIRS_ZERO)
- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_SHARK): $(SUBDIRS_SHARK)
- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
diff -r ec3cd225cbec -r 6a756a2b18c7 patches/pax-mark-rmic-java.patch
--- a/patches/pax-mark-rmic-java.patch Wed Feb 19 18:18:22 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- openjdk/jdk/make/com/sun/jmx/Makefile
-+++ openjdk/jdk/make/com/sun/jmx/Makefile
-@@ -119,6 +119,7 @@
-
- $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
- $(prep-target)
-+ "$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
- $(RMIC) -classpath "$(CLASSDESTDIR)" \
- -d $(CLASSDESTDIR) \
- -v1.2 \
diff -r ec3cd225cbec -r 6a756a2b18c7 patches/test_gamma.patch
--- a/patches/test_gamma.patch Wed Feb 19 18:18:22 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-diff -Nru ../openjdk.orig/openjdk/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile
---- ../openjdk.orig/openjdk/hotspot/make/linux/Makefile 2009-10-30 17:37:07.000000000 +0000
-+++ openjdk/hotspot/make/linux/Makefile 2009-10-30 17:45:40.000000000 +0000
-@@ -287,42 +287,36 @@
-
- $(TARGETS_C2): $(SUBDIRS_C2)
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_TIERED): $(SUBDIRS_TIERED)
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_C1): $(SUBDIRS_C1)
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_CORE): $(SUBDIRS_CORE)
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_ZERO): $(SUBDIRS_ZERO)
- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_SHARK): $(SUBDIRS_SHARK)
- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
More information about the distro-pkg-dev
mailing list