aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Ushakov <alexey.ushakov@jetbrains.com>2019-01-29 17:29:01 +0300
committerAlexey Ushakov <alexey.ushakov@jetbrains.com>2019-02-03 12:02:14 +0300
commit6e65e78134f3e8027a1b077d41b6d1109e6ae1e5 (patch)
tree9d39169e89c0e35f0e705a83a13c8eedba9699ac
parenteb7dac3b769695d80788ab524cb8e455b0f6d36e (diff)
downloadjdk8u_hotspot-6e65e78134f3e8027a1b077d41b6d1109e6ae1e5.tar.gz
Fixed compiler errors in hotspot sources (cherry picked from commit 4426ec26a55ecc68ba7ea3e8a9aacca9ee0ed968) (cherry picked from commit b35de60521e218d908e2c5d14e6aa1e00b236580) (cherry picked from commit 72d1bd2162c05fab0fe69cc4efe3139c5ea0e22f)
-rw-r--r--src/os/linux/vm/os_linux.inline.hpp5
-rw-r--r--src/os_cpu/linux_x86/vm/os_linux_x86.cpp1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/os/linux/vm/os_linux.inline.hpp b/src/os/linux/vm/os_linux.inline.hpp
index 10d56d89f..fea10fa64 100644
--- a/src/os/linux/vm/os_linux.inline.hpp
+++ b/src/os/linux/vm/os_linux.inline.hpp
@@ -114,8 +114,12 @@ inline int os::ftruncate(int fd, jlong length) {
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 @@ inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf)
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 1a7375afc..e963daa29 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 @@ JVM_handle_linux_signal(int sig,
err.report_and_die();
ShouldNotReachHere();
+ return false;
}
void os::Linux::init_thread_fpu_state(void) {