make/test/JtregNativeHotspot.gmk

*** 138,148 ****
      -I$(VM_TESTBASE_DIR)/nsk/share/aod \
      -I$(VM_TESTBASE_DIR)/nsk/share/native \
      -I$(VM_TESTBASE_DIR)/nsk/share/jni
  
  NO_FRAMEPOINTER_CFLAGS :=
! ifeq ($(OPENJDK_TARGET_OS),linux)
     NO_FRAMEPOINTER_CFLAGS := -fomit-frame-pointer
  endif
  
  BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libNoFramePointer := $(NO_FRAMEPOINTER_CFLAGS)
  # Optimization -O3 needed, HIGH == -O3
--- 138,148 ----
      -I$(VM_TESTBASE_DIR)/nsk/share/aod \
      -I$(VM_TESTBASE_DIR)/nsk/share/native \
      -I$(VM_TESTBASE_DIR)/nsk/share/jni
  
  NO_FRAMEPOINTER_CFLAGS :=
! ifeq ($(call isTargetOs, linux), true)
     NO_FRAMEPOINTER_CFLAGS := -fomit-frame-pointer
  endif
  
  BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libNoFramePointer := $(NO_FRAMEPOINTER_CFLAGS)
  # Optimization -O3 needed, HIGH == -O3
*** 847,861 ****
  BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine09agent00 := $(NSK_AOD_INCLUDES)
  
  ################################################################################
  
  # Platform specific setup
! ifneq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
    BUILD_HOTSPOT_JTREG_EXCLUDE += liboverflow.c exeThreadSignalMask.c
  endif
  
! ifeq ($(OPENJDK_TARGET_OS), linux)
      BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rw := -z noexecstack
      BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rwx := -z execstack
      BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstepBreakPopReturn := -lpthread
      BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIndyRedefineClass := -lpthread
      BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefineClasses := -lpthread
--- 847,861 ----
  BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libVirtualMachine09agent00 := $(NSK_AOD_INCLUDES)
  
  ################################################################################
  
  # Platform specific setup
! ifneq ($(call isTargetOs, solaris)+$(call isTargetCpuArch, sparc), true+true)
    BUILD_HOTSPOT_JTREG_EXCLUDE += liboverflow.c exeThreadSignalMask.c
  endif
  
! ifeq ($(call isTargetOs, linux), true)
      BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rw := -z noexecstack
      BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rwx := -z execstack
      BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libstepBreakPopReturn := -lpthread
      BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libIndyRedefineClass := -lpthread
      BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libredefineClasses := -lpthread
*** 868,882 ****
        exeinvoke.c exestack-gap.c
  endif
  
  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm
  
! ifeq ($(OPENJDK_TARGET_OS), solaris)
      BUILD_HOTSPOT_JTREG_EXCLUDE += libterminatedThread.c
  endif
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
      BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
      BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c
  
  else
      BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
--- 868,882 ----
        exeinvoke.c exestack-gap.c
  endif
  
  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm
  
! ifeq ($(call isTargetOs, solaris), true)
      BUILD_HOTSPOT_JTREG_EXCLUDE += libterminatedThread.c
  endif
  
! ifeq ($(call isTargetOs, windows), true)
      BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
      BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c
  
  else
      BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread