Skip to content

updpatch: java8-openjdk 8.482.u08-1 #5157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felixonmars merged 1 commit into from
Mar 5, 2026
Merged

updpatch: java8-openjdk 8.482.u08-1 #5157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions java8-openjdk/jdk8-riscv.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
diff --git a/jdk8u-jdk8u432-b05.orig/common/autoconf/build-aux/autoconf-config.guess b/jdk8u-jdk8u432-b05/common/autoconf/build-aux/autoconf-config.guess
diff --git a/jdk8u-jdk8u482-b08/common/autoconf/build-aux/autoconf-config.guess b/jdk8u-jdk8u482-b08/common/autoconf/build-aux/autoconf-config.guess
index 15ee438..c7355c3 100644
--- a/jdk8u-jdk8u432-b05.orig/common/autoconf/build-aux/autoconf-config.guess
+++ b/jdk8u-jdk8u432-b05/common/autoconf/build-aux/autoconf-config.guess
--- a/jdk8u-jdk8u482-b08/common/autoconf/build-aux/autoconf-config.guess
+++ b/jdk8u-jdk8u482-b08/common/autoconf/build-aux/autoconf-config.guess
@@ -1000,6 +1000,9 @@ EOF
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
+ riscv64:Linux:*:*)
+ echo riscv64-unknown-linux-gnu
+ exit ;;
+ echo riscv64-unknown-linux-gnu
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
diff --git a/jdk8u-jdk8u432-b05.orig/common/autoconf/build-aux/autoconf-config.sub b/jdk8u-jdk8u432-b05/common/autoconf/build-aux/autoconf-config.sub
diff --git a/jdk8u-jdk8u482-b08/common/autoconf/build-aux/autoconf-config.sub b/jdk8u-jdk8u482-b08/common/autoconf/build-aux/autoconf-config.sub
index 1aab2b3..662b002 100644
--- a/jdk8u-jdk8u432-b05.orig/common/autoconf/build-aux/autoconf-config.sub
+++ b/jdk8u-jdk8u432-b05/common/autoconf/build-aux/autoconf-config.sub
--- a/jdk8u-jdk8u482-b08/common/autoconf/build-aux/autoconf-config.sub
+++ b/jdk8u-jdk8u482-b08/common/autoconf/build-aux/autoconf-config.sub
@@ -302,6 +302,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
Expand All @@ -32,10 +32,10 @@ index 1aab2b3..662b002 100644
| romp-* | rs6000-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
diff --git a/jdk8u-jdk8u432-b05.orig/common/autoconf/platform.m4 b/jdk8u-jdk8u432-b05/common/autoconf/platform.m4
diff --git a/jdk8u-jdk8u482-b08/common/autoconf/platform.m4 b/jdk8u-jdk8u482-b08/common/autoconf/platform.m4
index f54942a..e70c159 100644
--- a/jdk8u-jdk8u432-b05.orig/common/autoconf/platform.m4
+++ b/jdk8u-jdk8u432-b05/common/autoconf/platform.m4
--- a/jdk8u-jdk8u482-b08/common/autoconf/platform.m4
+++ b/jdk8u-jdk8u482-b08/common/autoconf/platform.m4
@@ -102,6 +102,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=little
Expand All @@ -57,20 +57,22 @@ index f54942a..e70c159 100644
*) ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
esac
AC_SUBST(ZERO_ARCHDEF)
diff --git a/jdk8u-jdk8u432-b05.orig/hotspot/src/os/linux/vm/os_linux.cpp b/jdk8u-jdk8u432-b05/hotspot/src/os/linux/vm/os_linux.cpp
diff --git a/jdk8u-jdk8u482-b08/hotspot/src/os/linux/vm/os_linux.cpp b/jdk8u-jdk8u482-b08/hotspot/src/os/linux/vm/os_linux.cpp
index 5629a64..77fde84 100644
--- a/jdk8u-jdk8u432-b05.orig/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/jdk8u-jdk8u432-b05/hotspot/src/os/linux/vm/os_linux.cpp
@@ -363,7 +363,7 @@ void os::init_system_properties_values() {
// 1: ...
// ...
// 7: The default directories, normally /lib and /usr/lib.
--- a/jdk8u-jdk8u482-b08/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/jdk8u-jdk8u482-b08/hotspot/src/os/linux/vm/os_linux.cpp
@@ -363,8 +363,8 @@
// 1: ...
// ...
// 7: The default directories, normally /lib and /usr/lib.
-#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390))
- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
+#if defined(AMD64) || defined(_LP64) && (defined(SPARC) || defined(PPC) || defined(S390) || defined(RISCV))
#define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
+ #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib"
#else
#define DEFAULT_LIBPATH "/lib:/usr/lib"
@@ -1952,6 +1952,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
#if defined(AARCH64)
// Use 32-bit locations first for AARCH64 (a 64-bit architecture), since some systems
@@ -1959,6 +1959,9 @@
#ifndef EM_LOONGARCH
#define EM_LOONGARCH 258 /* LoongArch */
#endif
Expand All @@ -80,15 +82,15 @@ index 5629a64..77fde84 100644

static const arch_t arch_array[]={
{EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
@@ -1976,6 +1979,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
@@ -1986,6 +1989,7 @@
{EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
{EM_AARCH64, EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"},
{EM_LOONGARCH, EM_LOONGARCH, ELFCLASS64, ELFDATA2LSB, (char*)"LoongArch"},
+ {EM_RISCV, EM_RISCV, ELFCLASS64, ELFDATA2LSB, (char*)"RISCV"},
};

#if (defined IA32)
@@ -2010,9 +2014,11 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
@@ -2021,9 +2025,11 @@
static Elf32_Half running_arch_code=EM_AARCH64;
#elif (defined LOONGARCH64)
static Elf32_Half running_arch_code=EM_LOONGARCH;
Expand All @@ -101,7 +103,7 @@ index 5629a64..77fde84 100644
#endif

// Identify compatability class for VM's architecture and library's architecture
@@ -2045,10 +2051,12 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
@@ -2058,10 +2064,12 @@
}

#ifndef S390
Expand Down
14 changes: 8 additions & 6 deletions java8-openjdk/riscv64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- PKGBUILD
+++ PKGBUILD
@@ -49,6 +49,7 @@ case "${CARCH}" in
@@ -50,6 +50,7 @@
'x86_64' ) _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
'i686' ) _JARCH=i386 ; _DOC_ARCH=x86 ;;
'aarch64' ) _JARCH=aarch64 ; _DOC_ARCH=aarch64 ;;
+ 'riscv64' ) _JARCH=riscv64 ; _DOC_ARCH=riscv64 ;;
esac

_jdkname=openjdk8
@@ -65,6 +66,10 @@ _nonheadless=(
@@ -66,6 +67,10 @@
prepare() {
cd jdk8u-jdk${_majorver}u${_minorver}-b${_updatever}

Expand All @@ -19,7 +19,7 @@
# Do not treats warnings as errors
sed -E -i 's/(^WARNINGS_ARE_ERRORS = -W)(error)/\1no-\2/' \
hotspot/make/linux/makefiles/gcc.make
@@ -121,7 +126,9 @@ build() {
@@ -112,7 +117,9 @@
--with-extra-cflags="${CFLAGS}" \
--with-extra-cxxflags="${CXXFLAGS}" \
--with-extra-ldflags="${LDFLAGS}" \
Expand All @@ -30,7 +30,7 @@

# These help to debug builds: LOG=trace HOTSPOT_BUILD_JOBS=1
# Without 'DEBUG_BINARIES', i686 won't build: http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html
@@ -347,8 +354,11 @@ package_openjdk8-doc() {
@@ -338,8 +345,13 @@
pkgdesc='OpenJDK Java 8 documentation'

install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/"
Expand All @@ -39,7 +39,9 @@
"${pkgdir}/usr/share/doc/${pkgbase}/"
}

# vim: ts=2 sw=2 et:
+
+source+=(jdk8-riscv.patch)
+b2sums+=('f4b11b447bc36cdd26d2b157d7c6c2311e5b98fcae0c9e8d0507345c31a8a8f20c6c2af356ae87594e4d37fd5e7ba9d93441f273ca0578132c7ffb24a9b983f9')
+b2sums+=('640cdcb5f2e1df972d7561b1f76013a29c97cab3fb3b78996da5522c493904fffd965e6aada50215906d27c4c50d93facf82260036bec8345814a7ad9d0def60')
+
# vim: ts=2 sw=2 et:
+# vim: ts=2 sw=2 et: