diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2013-10-03 14:17:46 +0300 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2013-10-03 14:42:58 +0300 |
| commit | 35e46128122e425df54d719334ee8c262cc67e25 (patch) | |
| tree | f00a76eda77a463c085a82e2e037d6bebd23b3b7 /meta-aarch64/recipes-core/openjdk | |
| parent | 856fc1055a0a526f97cf9f6b6ed194abc7beee90 (diff) | |
openjdk-7: refresh patches for new release in meta-java
meta-java updated openjdk/icedtea, upgrade the bbappend to match
Diffstat (limited to 'meta-aarch64/recipes-core/openjdk')
| -rw-r--r-- | meta-aarch64/recipes-core/openjdk/files/icedtea-openjdk-aarch64.patch | 19 | ||||
| -rw-r--r-- | meta-aarch64/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bbappend (renamed from meta-aarch64/recipes-core/openjdk/openjdk-7_03b21-2.1.8.bbappend) | 0 |
2 files changed, 0 insertions, 19 deletions
diff --git a/meta-aarch64/recipes-core/openjdk/files/icedtea-openjdk-aarch64.patch b/meta-aarch64/recipes-core/openjdk/files/icedtea-openjdk-aarch64.patch index 30ffb8c2..a876ff9c 100644 --- a/meta-aarch64/recipes-core/openjdk/files/icedtea-openjdk-aarch64.patch +++ b/meta-aarch64/recipes-core/openjdk/files/icedtea-openjdk-aarch64.patch @@ -1,24 +1,5 @@ --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp -@@ -1893,7 +1893,8 @@ - {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_SH, EM_SH, ELFCLASS32, ELFDATA2LSB, (char*)"SH"} /* Support little endian only*/ -+ {EM_SH, EM_SH, ELFCLASS32, ELFDATA2LSB, (char*)"SH"}, /* Support little endian only*/ -+ {EM_AARCH64, EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"} /* Support little endian only*/ - }; - - #if (defined IA32) -@@ -1926,6 +1927,8 @@ - static Elf32_Half running_arch_code=EM_68K; - #elif (defined SH) - static Elf32_Half running_arch_code=EM_SH; -+ #elif (defined AARCH64) -+ static Elf32_Half running_arch_code=EM_AARCH64; - #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, SH @@ -5382,14 +5385,6 @@ extern char** environ; diff --git a/meta-aarch64/recipes-core/openjdk/openjdk-7_03b21-2.1.8.bbappend b/meta-aarch64/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bbappend index d3031846..d3031846 100644 --- a/meta-aarch64/recipes-core/openjdk/openjdk-7_03b21-2.1.8.bbappend +++ b/meta-aarch64/recipes-core/openjdk/openjdk-7_25b30-2.3.12.bbappend |