5 --- a/make/autoconf/flags-cflags.m4.orig 2019-01-08 09:40:27.000000000 +0000
6 +++ b/make/autoconf/flags-cflags.m4
7 @@ -42,8 +42,15 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
8 # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
9 SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags'
10 SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
11 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
12 + SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
13 + SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
14 + SET_SHARED_LIBRARY_NAME='-Wl,-h,[$]1'
15 + SET_SHARED_LIBRARY_MAPFILE='-Wl,-M,[$]1'
17 SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
18 SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
21 elif test "x$TOOLCHAIN_TYPE" = xclang; then
22 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
24 if test "x$OPENJDK_TARGET_OS" = xlinux; then
25 SET_EXECUTABLE_ORIGIN="$SET_EXECUTABLE_ORIGIN -Wl,--disable-new-dtags"
27 - SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
28 - SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
29 + if test "x$OPENJDK_TARGET_OS" = xsolaris; then
30 + SET_SHARED_LIBRARY_NAME='-Wl,-h,[$]1'
31 + SET_SHARED_LIBRARY_MAPFILE='-Wl,-M,[$]1'
33 + SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
34 + SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
37 # arm specific settings
38 if test "x$OPENJDK_TARGET_CPU" = "xarm"; then
39 @@ -494,6 +504,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
41 if test "x$TOOLCHAIN_TYPE" = xgcc; then
42 ALWAYS_DEFINES_JVM="-D_GNU_SOURCE -D_REENTRANT"
43 + ALWAYS_DEFINES_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
44 elif test "x$TOOLCHAIN_TYPE" = xclang; then
45 ALWAYS_DEFINES_JVM="-D_GNU_SOURCE"
46 elif test "x$TOOLCHAIN_TYPE" = xxlc; then