Merge JDK-8200758-branch
authorherrick
Fri, 05 Oct 2018 14:47:35 -0400
branchJDK-8200758-branch
changeset 56935 344eb87a55fb
parent 56934 ee544d03fb22 (current diff)
parent 52026 286389b60292 (diff)
child 56940 93d2d065257e
Merge
src/jdk.packager/share/native/library/common/LinuxPlatform.cpp
--- a/make/hotspot/lib/CompileJvm.gmk	Fri Oct 05 11:10:27 2018 -0400
+++ b/make/hotspot/lib/CompileJvm.gmk	Fri Oct 05 14:47:35 2018 -0400
@@ -92,7 +92,7 @@
   DISABLED_WARNINGS_gcc += return-type switch
 endif
 
-DISABLED_WARNINGS_clang := tautological-compare deprecated-declarations \
+DISABLED_WARNINGS_clang := tautological-compare \
     undefined-var-template sometimes-uninitialized unknown-pragmas \
     delete-non-virtual-dtor missing-braces char-subscripts \
     ignored-qualifiers missing-field-initializers mismatched-tags
--- a/src/hotspot/os/bsd/os_bsd.cpp	Fri Oct 05 11:10:27 2018 -0400
+++ b/src/hotspot/os/bsd/os_bsd.cpp	Fri Oct 05 14:47:35 2018 -0400
@@ -3238,16 +3238,6 @@
   Bsd::clock_init();
   initial_time_count = javaTimeNanos();
 
-#ifdef __APPLE__
-  // XXXDARWIN
-  // Work around the unaligned VM callbacks in hotspot's
-  // sharedRuntime. The callbacks don't use SSE2 instructions, and work on
-  // Linux, Solaris, and FreeBSD. On Mac OS X, dyld (rightly so) enforces
-  // alignment when doing symbol lookup. To work around this, we force early
-  // binding of all symbols now, thus binding when alignment is known-good.
-  _dyld_bind_fully_image_containing_address((const void *) &os::init);
-#endif
-
   os::Posix::init();
 }
 
--- a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp	Fri Oct 05 11:10:27 2018 -0400
+++ b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp	Fri Oct 05 14:47:35 2018 -0400
@@ -218,8 +218,8 @@
 
 // Checking for finiteness
 
-inline int g_isfinite(jfloat  f)                 { return finite(f); }
-inline int g_isfinite(jdouble f)                 { return finite(f); }
+inline int g_isfinite(jfloat  f)                 { return isfinite(f); }
+inline int g_isfinite(jdouble f)                 { return isfinite(f); }
 
 
 // Wide characters
--- a/src/jdk.packager/share/native/library/common/LinuxPlatform.cpp	Fri Oct 05 11:10:27 2018 -0400
+++ b/src/jdk.packager/share/native/library/common/LinuxPlatform.cpp	Fri Oct 05 14:47:35 2018 -0400
@@ -233,12 +233,6 @@
     return (s == strDest) ? 0 : 1;
 }
 
-static int DEPLOY_STRNCAT(char *strDest, size_t numberOfElements, const char *strSource, size_t count) {
-    // strncat always return null terminated string
-    char *s = strncat(strDest, strSource, count);
-    return (s == strDest) ? 0 : 1;
-}
-
 #define DEPLOY_STRICMP(x, y) \
     strcasecmp((x), (y))
 
@@ -281,16 +275,6 @@
 #define DEPLOY_ATOI(x) \
     atoi((x))
 
-static int getFileSize(TCHAR* filename) {
-    struct stat statBuf;
-    if (stat(filename, &statBuf) == 0) {
-        return statBuf.st_size;
-    }
-    return -1;
-}
-
-#define DEPLOY_FILE_SIZE(filename) getFileSize(filename)
-
 #define DEPLOY_FOPEN(x, y) \
     fopen((x), (y))