[openjdk-8] 04/05: Removed the unused patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sat Mar 29 23:30:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjdk-8.
commit 4ecc6fff1b998a099f574851191757ff10969d59
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Mar 29 23:51:11 2014 +0100
Removed the unused patches
---
debian/patches/hotspot-sparc-fix.diff | 21 --
debian/patches/hotspot-warn-no-errformat.diff | 24 --
debian/patches/icedtea-patch.diff | 303 --------------------------
debian/patches/jdk-zero-arch.diff | 29 ---
debian/patches/pkcs11-secmod-debug.diff | 13 --
debian/patches/ppc64el.diff | 53 -----
debian/patches/set-exec-name.diff | 47 ----
debian/patches/sparc-inline.diff | 128 -----------
debian/patches/stack-direction.diff | 217 ------------------
debian/rules | 5 -
10 files changed, 840 deletions(-)
diff --git a/debian/patches/hotspot-sparc-fix.diff b/debian/patches/hotspot-sparc-fix.diff
deleted file mode 100644
index bcee9d0..0000000
--- a/debian/patches/hotspot-sparc-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-# unused patch
-
---- openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp.orig 2009-10-14 17:13:15.000000000 +0000
-+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp 2009-11-02 13:15:17.000000000 +0000
-@@ -27,6 +27,7 @@
-
- static bool detect_niagara() {
- char cpu[128];
-+ char *buf = cpu;
- bool rv = false;
-
- FILE* fp = fopen("/proc/cpuinfo", "r");
-@@ -35,7 +36,7 @@
- }
-
- while (!feof(fp)) {
-- if (fscanf(fp, "cpu\t\t: %100[^\n]", &cpu) == 1) {
-+ if (fscanf(fp, "cpu\t\t: %100[^\n]", buf) == 1) {
- if (strstr(cpu, "Niagara") != NULL) {
- rv = true;
- }
diff --git a/debian/patches/hotspot-warn-no-errformat.diff b/debian/patches/hotspot-warn-no-errformat.diff
deleted file mode 100644
index 28c4c0d..0000000
--- a/debian/patches/hotspot-warn-no-errformat.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-# unused patch
-
---- openjdk/hotspot/make/solaris/makefiles/gcc.make~ 2009-10-02 23:16:39.000000000 +0200
-+++ openjdk/hotspot/make/solaris/makefiles/gcc.make 2009-10-22 07:05:58.000000000 +0200
-@@ -109,7 +109,7 @@
-
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+WARNINGS_ARE_ERRORS = -Werror -Wno-error=format
- # Enable these warnings. See 'info gcc' about details on these options
- ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
- CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
---- openjdk/hotspot/make/linux/makefiles/gcc.make~ 2009-10-22 06:58:44.000000000 +0200
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2009-10-22 07:06:00.000000000 +0200
-@@ -98,7 +98,7 @@
- endif
-
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+WARNINGS_ARE_ERRORS = -Werror -Wno-error=format
-
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
diff --git a/debian/patches/icedtea-patch.diff b/debian/patches/icedtea-patch.diff
deleted file mode 100644
index ef3dd43..0000000
--- a/debian/patches/icedtea-patch.diff
+++ /dev/null
@@ -1,303 +0,0 @@
-Description: Handle EXTRA_* flags into icedtea
- - Use -J-Xbootclasspath for javac of PulseAudio
- - Append $EXTRA_CFLAGS_IT to $IT_CFLAGS (use for PulseAudio native build)
- - Append $EXTRA_LDFLAGS_IT to PulseAudio native link
- - Send all EXTRA_* flags to jamvm and cacao
- - Remove `-icedtea' from the release identifier
- - Rename hotspot source and debian patches for zerovm build
- - Add x32 configure bits
-Author: Damien Raude-Morvan <drazzib at debian.org>, Matthias Klose <doko at ubuntu.com>
-
---- Makefile.am
-+++ Makefile.am
-@@ -150,7 +150,7 @@
- IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
-
- # Flags
--IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
-+IT_CFLAGS=$(CFLAGS) $(ARCHFLAG) $(EXTRA_CFLAGS_IT)
-
- # Conditional defintions
-
-@@ -1521,9 +1521,6 @@
- echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
- >>openjdk/jdk/make/common/shared/Defs.gmk ;
- endif
-- if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
-- proj_suffix="-$(PROJECT_NAME)"; \
-- fi ; \
- if test x"$(VERSION_SUFFIX)" != "x"; then \
- ver_suffix="-$(VERSION_SUFFIX)"; \
- fi ; \
-@@ -2215,7 +2212,7 @@
- -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $<
-
- $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
-- $(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
-+ $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS_IT) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
- -o $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
-
- endif
-@@ -2283,7 +2280,8 @@
- if BUILD_JAMVM
- cd jamvm/jamvm && \
- ./autogen.sh --with-java-runtime-library=openjdk7 \
-- --prefix=$(abs_top_builddir)/jamvm/install ; \
-+ --prefix=$(abs_top_builddir)/jamvm/install \
-+ CFLAGS='$(EXTRA_CFLAGS_JAMVM)' LDFLAGS='$(EXTRA_LDFLAGS_JAMVM)' CPPFLAGS='$(EXTRA_CPPFLAGS_JAMVM)' CXXFLAGS='$(EXTRA_CXXFLAGS_JAMVM)'; \
- $(MAKE) ; \
- $(MAKE) install
- mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
-@@ -2352,7 +2350,8 @@
- --with-java-runtime-library=openjdk7 \
- --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
- --with-java-runtime-library-classes=$(RUNTIME) \
-- --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
-+ --enable-jre-layout $(CACAO_CONFIGURE_ARGS) \
-+ CFLAGS='$(EXTRA_CFLAGS_CACAO)' LDFLAGS='$(EXTRA_LDFLAGS_CACAO)' CPPFLAGS='$(EXTRA_CPPFLAGS_CACAO)' CXXFLAGS='$(EXTRA_CXXFLAGS_CACAO)'; \
- $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
- ln -sf server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
- touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
-@@ -2428,7 +2427,7 @@
- '--with-javac=% '--with-javac=% \
- '--with-rmic=% '--with-additional-vms=% \
- '--disable-bootstrap% '--enable-bootstrap% , \
-- $(CONFIGURE_ARGS)) \
-+ $(subst hotspot-default.tar,hotspot-zero.tar,$(CONFIGURE_ARGS))) \
- $(foreach i, openjdk hotspot corba jaxp jaxws jdk langtools, \
- $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz))
-
-@@ -2438,7 +2437,7 @@
- BUILD_JAXWS=false ALT_JAXWS_DIST=$(BUILD_OUTPUT_DIR)/jaxws/dist \
- BUILD_CORBA=false ALT_CORBA_DIST=$(BUILD_OUTPUT_DIR)/corba/dist \
- BUILD_JDK=false \
-- DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(if $(findstring jamvm,$(p)),,$(p))))'
-+ DISTRIBUTION_PATCHES='$(foreach p,$(subst -default,-zero,$(DISTRIBUTION_PATCHES)),$(if $(findstring cacao,$(p)),,$(if $(findstring jamvm,$(p)),,$(p))))'
-
- stamps/add-zero.stamp: stamps/icedtea.stamp
- mkdir -p stamps
---- Makefile.in
-+++ Makefile.in
-@@ -637,7 +637,7 @@
- IT_JAVACFLAGS = $(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
-
- # Flags
--IT_CFLAGS = $(CFLAGS) $(ARCHFLAG)
-+IT_CFLAGS = $(CFLAGS) $(ARCHFLAG) $(EXTRA_CFLAGS_IT)
- @USE_HG_FALSE at OPENJDK_SRC_ZIP = openjdk.tar.gz
-
- # Conditional defintions
-@@ -988,9 +988,10 @@
- --disable-docs $(filter-out '--with-jdk-home=% '--with-ecj=% \
- '--with-java=% '--with-javah=% '--with-javac=% '--with-javac=% \
- '--with-rmic=% '--with-additional-vms=% '--disable-bootstrap% \
-- '--enable-bootstrap% , $(CONFIGURE_ARGS)) $(foreach i, openjdk \
-- hotspot corba jaxp jaxws jdk langtools, $(if $(findstring \
-- --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, \
-+ '--enable-bootstrap% , $(subst \
-+ hotspot-default.tar,hotspot-zero.tar,$(CONFIGURE_ARGS))) \
-+ $(foreach i, openjdk hotspot corba jaxp jaxws jdk langtools, \
-+ $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, \
- --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz))
- ADD_ZERO_EXTRA_BUILD_ENV = \
- BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \
-@@ -998,7 +999,7 @@
- BUILD_JAXWS=false ALT_JAXWS_DIST=$(BUILD_OUTPUT_DIR)/jaxws/dist \
- BUILD_CORBA=false ALT_CORBA_DIST=$(BUILD_OUTPUT_DIR)/corba/dist \
- BUILD_JDK=false \
-- DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(if $(findstring jamvm,$(p)),,$(p))))'
-+ DISTRIBUTION_PATCHES='$(foreach p,$(subst -default,-zero,$(DISTRIBUTION_PATCHES)),$(if $(findstring cacao,$(p)),,$(if $(findstring jamvm,$(p)),,$(p))))'
-
-
- # FIXME: this might need some adjustment for other OS than Linux
-@@ -2019,9 +2020,6 @@
- echo "DISTRO_NAME=$(DIST_NAME)" >>openjdk/jdk/make/common/shared/Defs.gmk ;
- @HAS_PKGVERSION_TRUE@ echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
- @HAS_PKGVERSION_TRUE@ >>openjdk/jdk/make/common/shared/Defs.gmk ;
-- if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
-- proj_suffix="-$(PROJECT_NAME)"; \
-- fi ; \
- if test x"$(VERSION_SUFFIX)" != "x"; then \
- ver_suffix="-$(VERSION_SUFFIX)"; \
- fi ; \
-@@ -2649,7 +2647,7 @@
- @ENABLE_PULSE_JAVA_TRUE@ -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $<
-
- @ENABLE_PULSE_JAVA_TRUE@$(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
-- at ENABLE_PULSE_JAVA_TRUE@ $(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
-+ at ENABLE_PULSE_JAVA_TRUE@ $(CC) $(LDFLAGS) $(EXTRA_LDFLAGS_IT) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
- @ENABLE_PULSE_JAVA_TRUE@ -o $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
-
- clean-pulse-java:
-@@ -2710,7 +2708,8 @@
- stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
- @BUILD_JAMVM_TRUE@ cd jamvm/jamvm && \
- @BUILD_JAMVM_TRUE@ ./autogen.sh --with-java-runtime-library=openjdk7 \
-- at BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install ; \
-+ at BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install \
-+ at BUILD_JAMVM_TRUE@ CFLAGS='$(EXTRA_CFLAGS_JAMVM)' LDFLAGS='$(EXTRA_LDFLAGS_JAMVM)' CPPFLAGS='$(EXTRA_CPPFLAGS_JAMVM)' CXXFLAGS='$(EXTRA_CXXFLAGS_JAMVM)'; \
- @BUILD_JAMVM_TRUE@ $(MAKE) ; \
- @BUILD_JAMVM_TRUE@ $(MAKE) install
- @BUILD_JAMVM_TRUE@ mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
-@@ -2770,7 +2769,8 @@
- @BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ --with-java-runtime-library=openjdk7 \
- @BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
- @BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ --with-java-runtime-library-classes=$(RUNTIME) \
-- at BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ --enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
-+ at BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ --enable-jre-layout $(CACAO_CONFIGURE_ARGS) \
-+ at BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ CFLAGS='$(EXTRA_CFLAGS_CACAO)' LDFLAGS='$(EXTRA_LDFLAGS_CACAO)' CPPFLAGS='$(EXTRA_CPPFLAGS_CACAO)' CXXFLAGS='$(EXTRA_CXXFLAGS_CACAO)'; \
- @BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ $(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
- @BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ ln -sf server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
- @BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ touch $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt
---- acinclude.m4
-+++ acinclude.m4
-@@ -2,10 +2,18 @@
- [
- case "${host_cpu}" in
- x86_64)
-- BUILD_ARCH_DIR=amd64
-- INSTALL_ARCH_DIR=amd64
-- JRE_ARCH_DIR=amd64
-- ARCHFLAG="-m64"
-+ case "${host}" in
-+ *x32)
-+ BUILD_ARCH_DIR=x32
-+ INSTALL_ARCH_DIR=x32
-+ JRE_ARCH_DIR=x32
-+ ;;
-+ *)
-+ BUILD_ARCH_DIR=amd64
-+ INSTALL_ARCH_DIR=amd64
-+ JRE_ARCH_DIR=amd64
-+ ARCHFLAG="-m64"
-+ esac
- ;;
- i?86)
- BUILD_ARCH_DIR=i586
-@@ -702,10 +710,10 @@
- ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
- dnl can't use AC_CHECK_SIZEOF on multilib
- case "${ZERO_LIBARCH}" in
-- arm|i386|ppc|s390|sh|sparc)
-+ arm|i386|ppc|s390|sh|sparc|x32)
- ZERO_BITSPERWORD=32
- ;;
-- aarch64|alpha|amd64|ia64|ppc64|s390x|sparcv9)
-+ aarch64|alpha|amd64|ia64|ppc64*|s390x|sparcv9)
- ZERO_BITSPERWORD=64
- ;;
- *)
-@@ -1954,7 +1962,7 @@
- AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
- if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
- dnl Check for LCMS2 headers and libraries.
-- PKG_CHECK_MODULES(LCMS2, lcms2 >= 2.5,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
-+ PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
- if test "x${LCMS2_FOUND}" = xno
- then
- AC_MSG_ERROR([Could not find LCMS >= 2.5; install it or build with --disable-system-lcms to use the in-tree copy.])
---- configure
-+++ configure
-@@ -7300,10 +7300,18 @@
-
- case "${host_cpu}" in
- x86_64)
-- BUILD_ARCH_DIR=amd64
-- INSTALL_ARCH_DIR=amd64
-- JRE_ARCH_DIR=amd64
-- ARCHFLAG="-m64"
-+ case "${host}" in
-+ *x32)
-+ BUILD_ARCH_DIR=x32
-+ INSTALL_ARCH_DIR=x32
-+ JRE_ARCH_DIR=x32
-+ ;;
-+ *)
-+ BUILD_ARCH_DIR=amd64
-+ INSTALL_ARCH_DIR=amd64
-+ JRE_ARCH_DIR=amd64
-+ ARCHFLAG="-m64"
-+ esac
- ;;
- i?86)
- BUILD_ARCH_DIR=i586
-@@ -7904,10 +7912,10 @@
-
- ZERO_LIBARCH="${INSTALL_ARCH_DIR}"
- case "${ZERO_LIBARCH}" in
-- arm|i386|ppc|s390|sh|sparc)
-+ arm|i386|ppc|s390|sh|sparc|x32)
- ZERO_BITSPERWORD=32
- ;;
-- aarch64|alpha|amd64|ia64|ppc64|s390x|sparcv9)
-+ aarch64|alpha|amd64|ia64|ppc64*|s390x|sparcv9)
- ZERO_BITSPERWORD=64
- ;;
- *)
-@@ -9044,10 +9052,18 @@
-
- case "${host_cpu}" in
- x86_64)
-- BUILD_ARCH_DIR=amd64
-- INSTALL_ARCH_DIR=amd64
-- JRE_ARCH_DIR=amd64
-- ARCHFLAG="-m64"
-+ case "${host}" in
-+ *x32)
-+ BUILD_ARCH_DIR=x32
-+ INSTALL_ARCH_DIR=x32
-+ JRE_ARCH_DIR=x32
-+ ;;
-+ *)
-+ BUILD_ARCH_DIR=amd64
-+ INSTALL_ARCH_DIR=amd64
-+ JRE_ARCH_DIR=amd64
-+ ARCHFLAG="-m64"
-+ esac
- ;;
- i?86)
- BUILD_ARCH_DIR=i586
-@@ -13396,12 +13412,12 @@
- pkg_cv_LCMS2_CFLAGS="$LCMS2_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2 >= 2.5\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "lcms2 >= 2.5") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "lcms2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_LCMS2_CFLAGS=`$PKG_CONFIG --cflags "lcms2 >= 2.5" 2>/dev/null`
-+ pkg_cv_LCMS2_CFLAGS=`$PKG_CONFIG --cflags "lcms2" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -13413,12 +13429,12 @@
- pkg_cv_LCMS2_LIBS="$LCMS2_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2 >= 2.5\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "lcms2 >= 2.5") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "lcms2") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_LCMS2_LIBS=`$PKG_CONFIG --libs "lcms2 >= 2.5" 2>/dev/null`
-+ pkg_cv_LCMS2_LIBS=`$PKG_CONFIG --libs "lcms2" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -13439,9 +13455,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LCMS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms2 >= 2.5" 2>&1`
-+ LCMS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms2" 2>&1`
- else
-- LCMS2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms2 >= 2.5" 2>&1`
-+ LCMS2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LCMS2_PKG_ERRORS" >&5
diff --git a/debian/patches/jdk-zero-arch.diff b/debian/patches/jdk-zero-arch.diff
deleted file mode 100644
index 0b61a3a..0000000
--- a/debian/patches/jdk-zero-arch.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- openjdk/jdk/make/jdk_generic_profile.sh~ 2013-07-25 18:10:09.000000000 +0200
-+++ openjdk/jdk/make/jdk_generic_profile.sh 2013-08-05 02:56:33.016845707 +0200
-@@ -269,7 +269,7 @@
- i386|ppc|s390|sparc|arm|sh)
- ARCH_DATA_MODEL=32
- ;;
-- amd64|ppc64|s390x|sparcv9|ia64|alpha)
-+ aarch64|amd64|ppc64|s390x|sparcv9|ia64|alpha)
- ARCH_DATA_MODEL=64
- ;;
- *)
-@@ -280,7 +280,7 @@
-
- # ZERO_ENDIANNESS is the endianness of the processor
- case "${ZERO_LIBARCH}" in
-- i386|amd64|ia64|arm)
-+ i386|amd64|ia64|arm|aarch64|mipsel)
- ZERO_ENDIANNESS=little
- ;;
- ppc*|s390*|sparc*|alpha)
-@@ -307,7 +307,7 @@
- s390)
- ZERO_ARCHFLAG="-m31"
- ;;
-- arm)
-+ arm|aarch64)
- ZERO_ARCHFLAG="-D_LITTLE_ENDIAN"
- ;;
- *)
diff --git a/debian/patches/pkcs11-secmod-debug.diff b/debian/patches/pkcs11-secmod-debug.diff
deleted file mode 100644
index 100662f..0000000
--- a/debian/patches/pkcs11-secmod-debug.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-# unused patch
-
---- openjdk/jdk/src/share/native/sun/security/pkcs11/j2secmod.h~ 2010-02-17 04:14:45.000000000 +0100
-+++ openjdk/jdk/src/share/native/sun/security/pkcs11/j2secmod.h 2010-04-12 15:00:23.903585870 +0200
-@@ -27,7 +27,7 @@
-
- #include "sun_security_pkcs11_Secmod.h"
-
--// #define SECMOD_DEBUG
-+#define SECMOD_DEBUG
-
- #include "j2secmod_md.h"
-
diff --git a/debian/patches/ppc64el.diff b/debian/patches/ppc64el.diff
deleted file mode 100644
index 73c01f4..0000000
--- a/debian/patches/ppc64el.diff
+++ /dev/null
@@ -1,53 +0,0 @@
---- openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.orig 2013-12-19 13:53:15.987056600 +0000
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2013-12-19 13:58:01.041010426 +0000
-@@ -34,9 +34,13 @@
- define_pd_global(bool, DontYieldALot, false);
- define_pd_global(intx, ThreadStackSize, 1664);
- #ifdef _LP64
--define_pd_global(intx, VMThreadStackSize, 1024);
-+#if defined (_LITTLE_ENDIAN) && defined (__powerpc64__)
-+define_pd_global(intx, VMThreadStackSize, 1920);
- #else
--define_pd_global(intx, VMThreadStackSize, 512);
-+define_pd_global(intx, VMThreadStackSize, 1280);
-+#endif
-+#else
-+define_pd_global(intx, VMThreadStackSize, 640);
- #endif // _LP64
- define_pd_global(intx, CompilerThreadStackSize, 0);
- define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -4538,6 +4538,7 @@
- initial_time_count = os::elapsed_counter();
- pthread_mutex_init(&dl_mutex, NULL);
-
-+NOT_ZERO (
- // If the pagesize of the VM is greater than 8K determine the appropriate
- // number of initial guard pages. The user can change this with the
- // command line arguments, if needed.
-@@ -4546,6 +4547,7 @@
- StackRedPages = 1;
- StackShadowPages = round_to((StackShadowPages*Linux::vm_default_page_size()), vm_page_size()) / vm_page_size();
- }
-+)
- }
-
- // To install functions for atexit system call
-@@ -4598,9 +4600,16 @@
- // size. Add a page for compiler2 recursion in main thread.
- // Add in 2*BytesPerWord times page size to account for VM stack during
- // class initialization depending on 32 or 64 bit VM.
-+NOT_ZERO (
- os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
- (size_t)(StackYellowPages+StackRedPages+StackShadowPages) * Linux::page_size() +
- (2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::vm_default_page_size());
-+)
-+ZERO_ONLY (
-+ os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
-+ (size_t)(StackYellowPages+StackRedPages+StackShadowPages+
-+ 2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::page_size());
-+)
-
- size_t threadStackSizeInBytes = ThreadStackSize * K;
- if (threadStackSizeInBytes != 0 &&
diff --git a/debian/patches/set-exec-name.diff b/debian/patches/set-exec-name.diff
deleted file mode 100644
index 5c4d954..0000000
--- a/debian/patches/set-exec-name.diff
+++ /dev/null
@@ -1,47 +0,0 @@
---- openjdk/jdk/src/solaris/bin/java_md.c.orig
-+++ openjdk/jdk/src/solaris/bin/java_md.c
-@@ -688,8 +688,19 @@
- char buf[PATH_MAX+1];
- int len = readlink(self, buf, PATH_MAX);
- if (len >= 0) {
-+ const char* prefixes[] = {"/cow/", "/persistmnt/", "/rofs/", "/rwfs/", "/squashmnt/", NULL};
-+ const char **prefix;
-+ size_t prefix_len = 0;
- buf[len] = '\0'; /* readlink doesn't nul terminate */
-- exec_path = JLI_StringDup(buf);
-+ for (prefix = prefixes; *prefix; prefix++) {
-+ prefix_len = strlen(buf) < strlen(*prefix) ? strlen(buf) : strlen(*prefix);
-+ if (!strncmp(*prefix, buf, prefix_len)) {
-+ prefix_len--;
-+ break;
-+ }
-+ prefix_len = 0;
-+ }
-+ exec_path = JLI_StringDup(buf + prefix_len);
- }
- }
- #else /* !__solaris__ && !__linux */
---- openjdk/hotspot/src/os/posix/launcher/java_md.c.orig
-+++ openjdk/hotspot/src/os/posix/launcher/java_md.c
-@@ -967,8 +967,19 @@
- char buf[PATH_MAX+1];
- int len = readlink(self, buf, PATH_MAX);
- if (len >= 0) {
-- buf[len] = '\0'; /* readlink doesn't nul terminate */
-- exec_path = JLI_StringDup(buf);
-+ buf[len] = '\0'; /* readlink doesn't nul terminate */
-+ const char* prefixes[] = {"/cow/", "/persistmnt/", "/rofs/", "/rwfs/", "/squashmnt/", NULL};
-+ const char **prefix;
-+ size_t prefix_len = 0;
-+ for (prefix = prefixes; *prefix; prefix++) {
-+ prefix_len = strlen(buf) < strlen(*prefix) ? strlen(buf) : strlen(*prefix);
-+ if (!strncmp(*prefix, buf, prefix_len)) {
-+ prefix_len--;
-+ break;
-+ }
-+ prefix_len = 0;
-+ }
-+ exec_path = JLI_StringDup(buf + prefix_len);
- }
- }
- #else /* !__sun && !__linux */
diff --git a/debian/patches/sparc-inline.diff b/debian/patches/sparc-inline.diff
deleted file mode 100644
index e67366b..0000000
--- a/debian/patches/sparc-inline.diff
+++ /dev/null
@@ -1,128 +0,0 @@
-# unused patch
-
---- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp.old 2009-10-02 23:16:39.000000000 +0200
-+++ openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp 2010-01-11 16:02:21.152335133 +0100
-@@ -45,6 +45,7 @@
-
- // inlines for SPARC assembler -- dmu 5/97
-
-+#if 0
- inline void Assembler::check_delay() {
- # ifdef CHECK_DELAY
- guarantee( delay_state != at_delay_slot, "must say delayed() when filling delay slot");
-@@ -56,6 +57,7 @@
- check_delay();
- AbstractAssembler::emit_long(x);
- }
-+#endif
-
- inline void Assembler::emit_data(int x, relocInfo::relocType rtype) {
- relocate(rtype);
-@@ -69,7 +71,9 @@
-
-
- inline void Assembler::add(Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(add_op3) | rs1(s1) | rs2(s2) ); }
-+#if 0
- inline void Assembler::add(Register s1, int simm13a, Register d, relocInfo::relocType rtype ) { emit_data( op(arith_op) | rd(d) | op3(add_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rtype ); }
-+#endif
- inline void Assembler::add(Register s1, int simm13a, Register d, RelocationHolder const& rspec ) { emit_data( op(arith_op) | rd(d) | op3(add_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec ); }
-
- inline void Assembler::bpr( RCondition c, bool a, Predict p, Register s1, address d, relocInfo::relocType rt ) { v9_only(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(bpr_op2) | wdisp16(intptr_t(d), intptr_t(pc())) | predict(p) | rs1(s1), rt); has_delay_slot(); }
-@@ -157,10 +161,12 @@
- if (a.has_index()) { assert(offset == 0, ""); ld( a.base(), a.index(), d); }
- else { ld( a.base(), a.disp() + offset, d); }
- }
-+#if 0
- inline void Assembler::ldsb(const Address& a, Register d, int offset) {
- if (a.has_index()) { assert(offset == 0, ""); ldsb(a.base(), a.index(), d); }
- else { ldsb(a.base(), a.disp() + offset, d); }
- }
-+#endif
- inline void Assembler::ldsh(const Address& a, Register d, int offset) {
- if (a.has_index()) { assert(offset == 0, ""); ldsh(a.base(), a.index(), d); }
- else { ldsh(a.base(), a.disp() + offset, d); }
-@@ -237,7 +243,9 @@
- // p 226
-
- inline void Assembler::stb( Register d, Register s1, Register s2) { emit_long( op(ldst_op) | rd(d) | op3(stb_op3) | rs1(s1) | rs2(s2) ); }
-+#if 0
- inline void Assembler::stb( Register d, Register s1, int simm13a) { emit_data( op(ldst_op) | rd(d) | op3(stb_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-+#endif
- inline void Assembler::sth( Register d, Register s1, Register s2) { emit_long( op(ldst_op) | rd(d) | op3(sth_op3) | rs1(s1) | rs2(s2) ); }
- inline void Assembler::sth( Register d, Register s1, int simm13a) { emit_data( op(ldst_op) | rd(d) | op3(sth_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
- inline void Assembler::stw( Register d, Register s1, Register s2) { emit_long( op(ldst_op) | rd(d) | op3(stw_op3) | rs1(s1) | rs2(s2) ); }
-@@ -249,7 +257,9 @@
- inline void Assembler::std( Register d, Register s1, Register s2) { v9_dep(); assert(d->is_even(), "not even"); emit_long( op(ldst_op) | rd(d) | op3(std_op3) | rs1(s1) | rs2(s2) ); }
- inline void Assembler::std( Register d, Register s1, int simm13a) { v9_dep(); assert(d->is_even(), "not even"); emit_data( op(ldst_op) | rd(d) | op3(std_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-
-+#if 0
- inline void Assembler::st( Register d, Register s1, Register s2) { stw(d, s1, s2); }
-+#endif
- inline void Assembler::st( Register d, Register s1, int simm13a) { stw(d, s1, simm13a); }
-
- #ifdef ASSERT
---- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp.old 2009-10-02 23:16:39.000000000 +0200
-+++ openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp 2010-01-11 16:02:10.644835375 +0100
-@@ -1105,12 +1105,21 @@
- AbstractAssembler::flush();
- }
-
-- inline void emit_long(int); // shadows AbstractAssembler::emit_long
-+ inline void emit_long(int x) {
-+ check_delay();
-+ AbstractAssembler::emit_long(x);
-+ }
- inline void emit_data(int x) { emit_long(x); }
- inline void emit_data(int, RelocationHolder const&);
- inline void emit_data(int, relocInfo::relocType rtype);
- // helper for above fcns
-- inline void check_delay();
-+ inline void check_delay() {
-+# ifdef CHECK_DELAY
-+ guarantee( delay_state != at_delay_slot, "must say delayed() when filling delay slot");
-+ delay_state = no_delay;
-+# endif
-+ }
-+
-
-
- public:
-@@ -1119,7 +1128,7 @@
- // pp 135 (addc was addx in v8)
-
- inline void add(Register s1, Register s2, Register d );
-- inline void add(Register s1, int simm13a, Register d, relocInfo::relocType rtype = relocInfo::none);
-+ inline void add(Register s1, int simm13a, Register d, relocInfo::relocType rtype = relocInfo::none) { emit_data( op(arith_op) | rd(d) | op3(add_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rtype ); }
- inline void add(Register s1, int simm13a, Register d, RelocationHolder const& rspec);
- inline void add(Register s1, RegisterOrConstant s2, Register d, int offset = 0);
- inline void add(const Address& a, Register d, int offset = 0) { add( a.base(), a.disp() + offset, d, a.rspec(offset)); }
-@@ -1331,7 +1340,10 @@
- inline void ld( Register s1, ByteSize simm13a, Register d);
- #endif
-
-- inline void ldsb(const Address& a, Register d, int offset = 0);
-+ inline void ldsb(const Address& a, Register d, int offset = 0) {
-+ if (a.has_index()) { assert(offset == 0, ""); ldsb(a.base(), a.index(), d); }
-+ else { ldsb(a.base(), a.disp() + offset, d); }
-+ }
- inline void ldsh(const Address& a, Register d, int offset = 0);
- inline void ldsw(const Address& a, Register d, int offset = 0);
- inline void ldub(const Address& a, Register d, int offset = 0);
-@@ -1552,7 +1564,7 @@
- // p 226
-
- inline void stb( Register d, Register s1, Register s2 );
-- inline void stb( Register d, Register s1, int simm13a);
-+ inline void stb( Register d, Register s1, int simm13a) { emit_data( op(ldst_op) | rd(d) | op3(stb_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
- inline void sth( Register d, Register s1, Register s2 );
- inline void sth( Register d, Register s1, int simm13a);
- inline void stw( Register d, Register s1, Register s2 );
-@@ -1561,7 +1573,7 @@
- inline void st( Register d, Register s1, int simm13a);
- inline void stx( Register d, Register s1, Register s2 );
- inline void stx( Register d, Register s1, int simm13a);
-- inline void std( Register d, Register s1, Register s2 );
-+ inline void std( Register d, Register s1, Register s2 ) { stw(d, s1, s2); }
- inline void std( Register d, Register s1, int simm13a);
-
- #ifdef ASSERT
diff --git a/debian/patches/stack-direction.diff b/debian/patches/stack-direction.diff
deleted file mode 100644
index 04deba3..0000000
--- a/debian/patches/stack-direction.diff
+++ /dev/null
@@ -1,217 +0,0 @@
-# unused patch (work in progress for PARISC support)
-
---- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.old 2010-01-06 16:30:02.000000000 +0100
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp 2010-01-06 23:14:47.000000000 +0100
-@@ -144,8 +144,13 @@
- address addr = (address) info->si_addr;
-
- // check if fault address is within thread stack
-+#ifdef __hppa__
-+ if (addr > thread->stack_base() &&
-+ addr <= thread->stack_base() + thread->stack_size()) {
-+#else
- if (addr < thread->stack_base() &&
- addr >= thread->stack_base() - thread->stack_size()) {
-+#endif
- // stack overflow
- if (thread->in_stack_yellow_zone(addr)) {
- thread->disable_stack_yellow_zone();
-@@ -294,7 +299,11 @@
- if (res != 0) {
- fatal1("pthread_attr_getstack failed with errno = %d", res);
- }
-+#ifdef __hppa__
-+ address stack_top = stack_bottom - stack_bytes;
-+#else
- address stack_top = stack_bottom + stack_bytes;
-+#endif
-
- // The block of memory returned by pthread_attr_getstack() includes
- // guard pages where present. We need to trim these off.
-@@ -321,7 +330,11 @@
- stack_bottom += (total_pages - guard_pages) / 2 * page_bytes;
- #endif // IA64
-
-+#ifdef __hppa__
-+ stack_bottom -= guard_bytes;
-+#else
- stack_bottom += guard_bytes;
-+#endif
-
- pthread_attr_destroy(&attr);
-
-@@ -329,19 +342,36 @@
- // by pthread_attr_getstack is the maximum size it could possibly
- // be given what currently mapped. This can be huge, so we cap it.
- if (os::Linux::is_initial_thread()) {
-+#ifdef __hppa__
-+ stack_bytes = stack_bottom - stack_top;
-+#else
- stack_bytes = stack_top - stack_bottom;
-+#endif
-
- if (stack_bytes > JavaThread::stack_size_at_create())
- stack_bytes = JavaThread::stack_size_at_create();
-
-+#ifdef __hppa__
-+ stack_bottom = stack_top + stack_bytes;
-+#else
- stack_bottom = stack_top - stack_bytes;
-+#endif
- }
-
-+#ifdef __hppa__
-+ assert(os::current_stack_pointer() <= stack_bottom, "should do");
-+ assert(os::current_stack_pointer() > stack_top, "should do");
-+#else
- assert(os::current_stack_pointer() >= stack_bottom, "should do");
- assert(os::current_stack_pointer() < stack_top, "should do");
-+#endif
-
- *bottom = stack_bottom;
-+#ifdef __hppa__
-+ *size = stack_bottom - stack_top;
-+#else
- *size = stack_top - stack_bottom;
-+#endif
- }
-
- address os::current_stack_base() {
---- openjdk/hotspot/src/share/vm/runtime/thread.cpp.old 2009-10-02 23:16:39.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/runtime/thread.cpp 2010-01-06 23:31:24.000000000 +0100
-@@ -713,8 +713,13 @@
- else if (is_ConcurrentGC_thread()) st->print("ConcurrentGCThread");
- else st->print("Thread");
-
-+#ifdef __hppa__
- st->print(" [stack: " PTR_FORMAT "," PTR_FORMAT "]",
- _stack_base - _stack_size, _stack_base);
-+#else
-+ st->print(" [stack: " PTR_FORMAT "," PTR_FORMAT "]",
-+ _stack_base + _stack_size, _stack_base);
-+#endif
-
- if (osthread()) {
- st->print(" [id=%d]", osthread()->thread_id());
-@@ -792,7 +797,11 @@
- bool Thread::is_in_stack(address adr) const {
- assert(Thread::current() == this, "is_in_stack can only be called from current thread");
- address end = os::current_stack_pointer();
-+#ifdef __hppa__
-+ if (stack_base() <= adr && adr <= end) return true;
-+#else
- if (stack_base() >= adr && adr >= end) return true;
-+#endif
-
- return false;
- }
-@@ -804,7 +813,11 @@
- // should be revisited, and they should be removed if possible.
-
- bool Thread::is_lock_owned(address adr) const {
-+#ifdef __hppa__
-+ return (_stack_base <= adr && adr <= (_stack_base + _stack_size));
-+#else
- return (_stack_base >= adr && adr >= (_stack_base - _stack_size));
-+#endif
- }
-
- bool Thread::set_as_starting_thread() {
-@@ -2108,7 +2121,11 @@
-
- void JavaThread::create_stack_guard_pages() {
- if (! os::uses_stack_guard_pages() || _stack_guard_state != stack_guard_unused) return;
-+#ifdef __hppa__
-+ address low_addr = stack_base();
-+#else
- address low_addr = stack_base() - stack_size();
-+#endif
- size_t len = (StackYellowPages + StackRedPages) * os::vm_page_size();
-
- int allocate = os::allocate_stack_guard_pages();
-@@ -2131,7 +2148,11 @@
-
- void JavaThread::remove_stack_guard_pages() {
- if (_stack_guard_state == stack_guard_unused) return;
-+#ifdef __hppa__
-+ address low_addr = stack_base();
-+#else
- address low_addr = stack_base() - stack_size();
-+#endif
- size_t len = (StackYellowPages + StackRedPages) * os::vm_page_size();
-
- if (os::allocate_stack_guard_pages()) {
-@@ -2156,10 +2177,17 @@
-
- // The base notation is from the stacks point of view, growing downward.
- // We need to adjust it to work correctly with guard_memory()
-+#ifdef __hppa__
-+ address base = stack_yellow_zone_base() + stack_yellow_zone_size();
-+
-+ guarantee(base > stack_base(),"Error calculating stack yellow zone");
-+ guarantee(base > os::current_stack_pointer(),"Error calculating stack yellow zone");
-+#else
- address base = stack_yellow_zone_base() - stack_yellow_zone_size();
-
- guarantee(base < stack_base(),"Error calculating stack yellow zone");
- guarantee(base < os::current_stack_pointer(),"Error calculating stack yellow zone");
-+#endif
-
- if (os::guard_memory((char *) base, stack_yellow_zone_size())) {
- _stack_guard_state = stack_guard_enabled;
-@@ -2178,7 +2206,11 @@
-
- // The base notation is from the stacks point of view, growing downward.
- // We need to adjust it to work correctly with guard_memory()
-+#ifdef __hppa__
-+ address base = stack_yellow_zone_base() + stack_yellow_zone_size();
-+#else
- address base = stack_yellow_zone_base() - stack_yellow_zone_size();
-+#endif
-
- if (os::unguard_memory((char *)base, stack_yellow_zone_size())) {
- _stack_guard_state = stack_guard_yellow_disabled;
-@@ -2192,10 +2224,17 @@
- // The base notation is from the stacks point of view, growing downward.
- // We need to adjust it to work correctly with guard_memory()
- assert(_stack_guard_state != stack_guard_unused, "must be using guard pages.");
-+#ifdef __hppa__
-+ address base = stack_red_zone_base() + stack_red_zone_size();
-+
-+ guarantee(base > stack_base(),"Error calculating stack red zone");
-+ guarantee(base > os::current_stack_pointer(),"Error calculating stack red zone");
-+#else
- address base = stack_red_zone_base() - stack_red_zone_size();
-
- guarantee(base < stack_base(),"Error calculating stack red zone");
- guarantee(base < os::current_stack_pointer(),"Error calculating stack red zone");
-+#endif
-
- if(!os::guard_memory((char *) base, stack_red_zone_size())) {
- warning("Attempt to guard stack red zone failed.");
-@@ -2206,7 +2245,11 @@
- // The base notation is from the stacks point of view, growing downward.
- // We need to adjust it to work correctly with guard_memory()
- assert(_stack_guard_state != stack_guard_unused, "must be using guard pages.");
-+#ifdef __hppa__
-+ address base = stack_red_zone_base() + stack_red_zone_size();
-+#else
- address base = stack_red_zone_base() - stack_red_zone_size();
-+#endif
- if (!os::unguard_memory((char *)base, stack_red_zone_size())) {
- warning("Attempt to unguard stack red zone failed.");
- }
-@@ -2451,8 +2494,13 @@
- if (osthread()) {
- st->print(", id=%d", osthread()->thread_id());
- }
-+#ifdef __hppa__
-+ st->print(", stack(" PTR_FORMAT "," PTR_FORMAT ")",
-+ _stack_base + _stack_size, _stack_base);
-+#else
- st->print(", stack(" PTR_FORMAT "," PTR_FORMAT ")",
- _stack_base - _stack_size, _stack_base);
-+#endif
- st->print("]");
- return;
- }
diff --git a/debian/rules b/debian/rules
index 1477c45..6db44be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -467,14 +467,9 @@ ifeq (,$(filter $(distrel),lenny squeeze oneiric natty maverick lucid jaunty int
debian/patches/fontconfig-japanese.diff
endif
-# debian/patches/sparc-inline.diff \
-# debian/patches/pkcs11-secmod-debug.diff \
-
DISTRIBUTION_PATCHES += \
debian/patches/hotspot-libpath-$(hotspot_version).diff
-# debian/patches/hotspot-warn-no-errformat.diff \
-
ifeq ($(with_pulse),yes)
# only in karmic and later the default
ifeq (,$(filter $(distrel), lenny squeeze sid jaunty intrepid hardy))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git
More information about the pkg-java-commits
mailing list