JRE-1156 JBRE 8u sources cannot be build on Ubuntu 8.10 (gcc 8.2.0)
Fixed compiler errors in hotspot sources
(cherry picked from commit 4426ec26a55ecc68ba7ea3e8a9aacca9ee0ed968)
(cherry picked from commit b35de60521e218d908e2c5d14e6aa1e00b236580)
(cherry picked from commit 72d1bd2162c05fab0fe69cc4efe3139c5ea0e22f)
diff --git a/src/os/linux/vm/os_linux.inline.hpp b/src/os/linux/vm/os_linux.inline.hpp
index 10d56d8..fea10fa 100644
--- a/src/os/linux/vm/os_linux.inline.hpp
+++ b/src/os/linux/vm/os_linux.inline.hpp
@@ -114,8 +114,12 @@
return ::ftruncate64(fd, length);
}
+// readdir_r has been deprecated since glibc 2.24.
+// See https://sourceware.org/bugzilla/show_bug.cgi?id=19056 for more details.
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf)
{
+
dirent* p;
int status;
assert(dirp != NULL, "just checking");
@@ -129,6 +133,7 @@
return NULL;
} else
return p;
+
}
inline int os::closedir(DIR *dirp) {
diff --git a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
index 1a7375a..e963daa 100644
--- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -541,6 +541,7 @@
err.report_and_die();
ShouldNotReachHere();
+ return false;
}
void os::Linux::init_thread_fpu_state(void) {
