common/autoconf/flags.m4

*** 1,7 ****
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 255,266 ****
        SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1'
        SET_SHARED_LIBRARY_MAPFILE=''
      else
        # Default works for linux, might work on other platforms as well.
        SHARED_LIBRARY_FLAGS='-shared'
!       SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1'
!       SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
        SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
        SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
      fi
    elif test "x$TOOLCHAIN_TYPE" = xclang; then
      C_FLAG_REORDER=''
--- 255,271 ----
        SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1'
        SET_SHARED_LIBRARY_MAPFILE=''
      else
        # Default works for linux, might work on other platforms as well.
        SHARED_LIBRARY_FLAGS='-shared'
!       if test "x$OPENJDK_TARGET_OS_ENV" = xbsd.netbsd; then
!         # -rpath $ORIGIN is broken on NetBSD.
!         SET_EXECUTABLE_ORIGIN=''
!       else
!         SET_EXECUTABLE_ORIGIN='-Wl,-z,origin -Wl,-rpath,\$$$$ORIGIN[$]1'
!       fi
!       SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
        SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
        SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
      fi
    elif test "x$TOOLCHAIN_TYPE" = xclang; then
      C_FLAG_REORDER=''
*** 276,287 ****
        SET_SHARED_LIBRARY_MAPFILE=''
      else
        # Default works for linux, might work on other platforms as well.
        PICFLAG='-fPIC'
        SHARED_LIBRARY_FLAGS='-shared'
!       SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1'
!       SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
        SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
        SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
      fi
    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
      PICFLAG="-KPIC"
--- 281,297 ----
        SET_SHARED_LIBRARY_MAPFILE=''
      else
        # Default works for linux, might work on other platforms as well.
        PICFLAG='-fPIC'
        SHARED_LIBRARY_FLAGS='-shared'
!       if test "x$OPENJDK_TARGET_OS_ENV" = xbsd.netbsd; then
!         # -rpath $ORIGIN is broken on NetBSD.
!         SET_EXECUTABLE_ORIGIN=''
!       else
!         SET_EXECUTABLE_ORIGIN='-Wl,-z,origin -Wl,-rpath,\$$$$ORIGIN[$]1'
!       fi
!       SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
        SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
        SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
      fi
    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
      PICFLAG="-KPIC"