hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
changeset 35226 4aee3c29fc2d
parent 34610 0d0012bed22c
parent 35217 ce4b5303a813
child 35236 627e7f8410dd
equal deleted inserted replaced
35081:070c4f5b3569 35226:4aee3c29fc2d
    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 := $(HOTSPOT_TOPDIR)/agent
    32 SA_TOPDIR := $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent
    33 
       
    34 # SA has a slightly different OS naming scheme
       
    35 ifeq ($(OPENJDK_TARGET_OS), windows)
       
    36   SA_TARGET_OS := win32
       
    37 else ifeq ($(OPENJDK_TARGET_OS), macosx)
       
    38   SA_TARGET_OS := bsd
       
    39 else
       
    40   SA_TARGET_OS := $(OPENJDK_TARGET_OS)
       
    41 endif
       
    42 
    33 
    43 # Defaults for most platforms
    34 # Defaults for most platforms
    44 SA_TOOLCHAIN := TOOLCHAIN_DEFAULT
    35 SA_TOOLCHAIN := TOOLCHAIN_DEFAULT
    45 SA_NAME := saproc
    36 SA_NAME := saproc
    46 SA_SRC += $(SA_TOPDIR)/src/share/native $(SA_TOPDIR)/src/os/$(SA_TARGET_OS)
    37 SA_SRC += $(SA_TOPDIR)/share/native/libsaproc $(SA_TOPDIR)/$(OPENJDK_TARGET_OS)/native/libsaproc
    47 SA_MAPFILE := $(SA_TOPDIR)/src/os/$(OPENJDK_TARGET_OS)/mapfile
    38 SA_MAPFILE := $(HOTSPOT_TOPDIR)/make/mapfiles/libsaproc/mapfile-$(OPENJDK_TARGET_OS)
    48 SA_INCLUDES := \
    39 SA_INCLUDES := \
    49     $(addprefix -I, $(SA_SRC)) \
    40     $(addprefix -I, $(SA_SRC)) \
    50     -I$(SUPPORT_OUTPUTDIR)/headers/jdk.hotspot.agent \
    41     -I$(SUPPORT_OUTPUTDIR)/headers/jdk.hotspot.agent \
    51     -I$(HOTSPOT_TOPDIR)/src/os/$(OPENJDK_TARGET_OS) \
    42     -I$(HOTSPOT_TOPDIR)/src/os/$(OPENJDK_TARGET_OS) \
    52     #
    43     #
    64   SA_LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_MACHINE_FLAG_linux)
    55   SA_LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_MACHINE_FLAG_linux)
    65   SA_LIBS := -lthread_db $(LIBDL)
    56   SA_LIBS := -lthread_db $(LIBDL)
    66 
    57 
    67 else ifeq ($(OPENJDK_TARGET_OS), solaris)
    58 else ifeq ($(OPENJDK_TARGET_OS), solaris)
    68   SA_TOOLCHAIN := TOOLCHAIN_LINK_CXX
    59   SA_TOOLCHAIN := TOOLCHAIN_LINK_CXX
    69   SA_MAPFILE := $(SA_TOPDIR)/src/os/solaris/proc/mapfile
    60   COMMON_CFLAGS := -DSOLARIS_11_B159_OR_LATER
    70   COMMON_CFLAGS := -I$(SA_TOPDIR)/src/os/$(OPENJDK_TARGET_OS)/proc \
       
    71       -DSOLARIS_11_B159_OR_LATER
       
    72   SA_CFLAGS := $(CFLAGS_JDKLIB) $(COMMON_CFLAGS)
    61   SA_CFLAGS := $(CFLAGS_JDKLIB) $(COMMON_CFLAGS)
    73   SA_CXXFLAGS := $(CXXFLAGS_JDKLIB) $(COMMON_CFLAGS)
    62   SA_CXXFLAGS := $(CXXFLAGS_JDKLIB) $(COMMON_CFLAGS)
    74   SA_LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,, $(LDFLAGS_JDKLIB)) \
    63   SA_LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,, $(LDFLAGS_JDKLIB)) \
    75       -mt $(LDFLAGS_CXX_JDK)
    64       -mt $(LDFLAGS_CXX_JDK)
    76   SA_LIBS := -ldl -ldemangle -lthread -lc
    65   SA_LIBS := -ldl -ldemangle -lthread -lc