------------------------------------------------------------
revno: 665
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk8
timestamp: Tue 2015-12-15 08:51:17 +0100
message:
* Fix applying patches on arm64.
added:
debian/patches/zero-sh.diff
modified:
debian/changelog
debian/patches/zero-architectures.diff
debian/rules
--
lp:~openjdk/openjdk/openjdk8
https://code.launchpad.net/~openjdk/openjdk/openjdk8
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk8.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog 2015-12-15 07:48:54 +0000
+++ debian/changelog 2015-12-15 07:51:17 +0000
@@ -1,3 +1,9 @@
+openjdk-8 (8u72-b05-5) UNRELEASED; urgency=medium
+
+ * Fix applying patches on arm64.
+
+ -- Matthias Klose <d...@ubuntu.com> Tue, 15 Dec 2015 08:49:25 +0100
+
openjdk-8 (8u72-b05-4) unstable; urgency=medium
* openjdk-8-jdk: Fix typo in sdk provides. Addresses: #803150.
=== modified file 'debian/patches/zero-architectures.diff'
--- debian/patches/zero-architectures.diff 2015-12-15 07:48:54 +0000
+++ debian/patches/zero-architectures.diff 2015-12-15 07:51:17 +0000
@@ -104,30 +104,3 @@
TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$ZERO_ARCHFLAG], [], [ZERO_ARCHFLAG=""])
AC_SUBST(ZERO_ARCHFLAG)
-Index: b/hotspot/src/os/linux/vm/os_linux.cpp
-===================================================================
---- a/hotspot/src/os/linux/vm/os_linux.cpp
-+++ b/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -1897,7 +1897,8 @@ void * os::dll_load(const char *filename
- {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
- {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
- {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
-- {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}
-+ {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
-+ {EM_SH, EM_SH, ELFCLASS32, ELFDATA2LSB, (char*)"Hitachi SH"}
- };
-
- #if (defined IA32)
-@@ -1928,9 +1929,11 @@ void * os::dll_load(const char *filename
- static Elf32_Half running_arch_code=EM_MIPS;
- #elif (defined M68K)
- static Elf32_Half running_arch_code=EM_68K;
-+ #elif (defined ZERO_SH)
-+ static Elf32_Half running_arch_code=EM_SH;
- #else
- #error Method os::dll_load requires that one of following is defined:\
-- IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K
-+ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, SH
- #endif
-
- // Identify compatability class for VM's architecture and library's architecture
=== added file 'debian/patches/zero-sh.diff'
--- debian/patches/zero-sh.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/zero-sh.diff 2015-12-15 07:51:17 +0000
@@ -0,0 +1,29 @@
+# DP: Add support for sh
+
+Index: b/hotspot/src/os/linux/vm/os_linux.cpp
+===================================================================
+--- a/hotspot/src/os/linux/vm/os_linux.cpp
++++ b/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -1897,7 +1897,8 @@ void * os::dll_load(const char *filename
+ {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
+ {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
+ {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
+- {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}
++ {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
++ {EM_SH, EM_SH, ELFCLASS32, ELFDATA2LSB, (char*)"Hitachi SH"}
+ };
+
+ #if (defined IA32)
+@@ -1928,9 +1929,11 @@ void * os::dll_load(const char *filename
+ static Elf32_Half running_arch_code=EM_MIPS;
+ #elif (defined M68K)
+ static Elf32_Half running_arch_code=EM_68K;
++ #elif (defined ZERO_SH)
++ static Elf32_Half running_arch_code=EM_SH;
+ #else
+ #error Method os::dll_load requires that one of following is defined:\
+- IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K
++ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, SH
+ #endif
+
+ // Identify compatability class for VM's architecture and library's architecture
=== modified file 'debian/rules'
--- debian/rules 2015-12-15 07:48:54 +0000
+++ debian/rules 2015-12-15 07:51:17 +0000
@@ -423,7 +423,8 @@
ifeq (,$(filter $(DEB_HOST_ARCH),arm64))
COMMON_PATCHES += \
ppc64le-8036767.diff \
- hotspot-powerpcspe.diff
+ hotspot-powerpcspe.diff \
+ zero-sh.diff
# FIXME zero-opt.diff
endif
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
