make/lib/Lib-jdk.hotspot.agent.gmk
branchihse-jdk-library-branch
changeset 56433 c3cf838aa2da
parent 56421 92bea2b7732a
child 56454 82c3ae69914f
equal deleted inserted replaced
56421:92bea2b7732a 56433:c3cf838aa2da
    27 
    27 
    28 $(eval $(call IncludeCustomExtension, hotspot/lib/Lib-jdk.hotspot.agent.gmk))
    28 $(eval $(call IncludeCustomExtension, hotspot/lib/Lib-jdk.hotspot.agent.gmk))
    29 
    29 
    30 ################################################################################
    30 ################################################################################
    31 
    31 
    32 SA_TOPDIR := $(TOPDIR)/src/jdk.hotspot.agent
       
    33 
       
    34 SA_SRC += \
       
    35     $(SA_TOPDIR)/share/native/libsaproc \
       
    36     $(SA_TOPDIR)/$(OPENJDK_TARGET_OS)/native/libsaproc \
       
    37     #
       
    38 
       
    39 SA_INCLUDES := \
       
    40     $(addprefix -I, $(SA_SRC)) \
       
    41     -I$(SUPPORT_OUTPUTDIR)/headers/jdk.hotspot.agent \
       
    42     -I$(TOPDIR)/src/hotspot/os/$(OPENJDK_TARGET_OS) \
       
    43     #
       
    44 
       
    45 ifeq ($(OPENJDK_TARGET_OS), linux)
    32 ifeq ($(OPENJDK_TARGET_OS), linux)
    46   SA_CFLAGS := -D_FILE_OFFSET_BITS=64
    33   SA_CFLAGS := -D_FILE_OFFSET_BITS=64
    47 
    34 
    48 else ifeq ($(OPENJDK_TARGET_OS), solaris)
    35 else ifeq ($(OPENJDK_TARGET_OS), solaris)
    49   SA_LDFLAGS := -mt
    36   SA_LDFLAGS := -mt
    66     NAME := saproc, \
    53     NAME := saproc, \
    67     OPTIMIZATION := NONE, \
    54     OPTIMIZATION := NONE, \
    68     DISABLED_WARNINGS_microsoft := 4267, \
    55     DISABLED_WARNINGS_microsoft := 4267, \
    69     DISABLED_WARNINGS_gcc := sign-compare, \
    56     DISABLED_WARNINGS_gcc := sign-compare, \
    70     DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
    57     DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \
    71     SRC := $(SA_SRC), \
    58     CFLAGS := $(CFLAGS_JDKLIB) $(SA_CFLAGS), \
    72     CFLAGS := $(CFLAGS_JDKLIB) $(SA_INCLUDES) $(SA_CFLAGS) $(SA_CUSTOM_CFLAGS), \
    59     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_CFLAGS) $(SA_CXXFLAGS), \
    73     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(SA_INCLUDES) $(SA_CFLAGS) $(SA_CXXFLAGS), \
    60     HEADER_FLAGS := \
       
    61         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.hotspot.agent \
       
    62         -I$(TOPDIR)/src/hotspot/os/$(OPENJDK_TARGET_OS), \
    74     LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
    63     LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
    75     LIBS_linux := -lthread_db $(LIBDL), \
    64     LIBS_linux := -lthread_db $(LIBDL), \
    76     LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
    65     LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
    77     LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \
    66     LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \
    78         -framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \
    67         -framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \