Mercurial > hg > truffle
comparison make/bsd/makefiles/saproc.make @ 4006:436b4a3231bf
7098194: integrate macosx-port changes
Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29.
Reviewed-by: kvn, dholmes, never, phh
Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author | dcubed |
---|---|
date | Thu, 13 Oct 2011 09:35:42 -0700 |
parents | f08d439fab8c |
children | 5a98bf7d847b |
comparison
equal
deleted
inserted
replaced
4005:2ef3386478e6 | 4006:436b4a3231bf |
---|---|
38 | 38 |
39 AGENT_DIR = $(GAMMADIR)/agent | 39 AGENT_DIR = $(GAMMADIR)/agent |
40 | 40 |
41 SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family) | 41 SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family) |
42 | 42 |
43 # disable building saproc until hsearch_r license issues are resolved | 43 NON_STUB_SASRCFILES = $(SASRCDIR)/salibelf.c \ |
44 #ifeq ($(OS_VENDOR), FreeBSD) | 44 $(SASRCDIR)/symtab.c \ |
45 #SASRCFILES = $(SASRCDIR)/salibelf.c \ | 45 $(SASRCDIR)/libproc_impl.c \ |
46 # $(SASRCDIR)/symtab.c \ | 46 $(SASRCDIR)/ps_proc.c \ |
47 # $(SASRCDIR)/libproc_impl.c \ | 47 $(SASRCDIR)/ps_core.c \ |
48 # $(SASRCDIR)/ps_proc.c \ | 48 $(SASRCDIR)/BsdDebuggerLocal.c |
49 # $(SASRCDIR)/ps_core.c \ | 49 |
50 # $(SASRCDIR)/hsearch_r.c \ | 50 ifeq ($(OS_VENDOR), FreeBSD) |
51 # $(SASRCDIR)/BsdDebuggerLocal.c | 51 SASRCFILES = $(NON_STUB_SASRCFILES) |
52 #SALIBS = -lutil -lthread_db | 52 SALIBS = -lutil -lthread_db |
53 #else | 53 SAARCH = $(ARCHFLAG) |
54 SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c | 54 else |
55 SALIBS = | 55 ifeq ($(OS_VENDOR), Darwin) |
56 #endif | 56 SASRCFILES = $(SASRCDIR)/MacosxDebuggerLocal.m |
57 SALIBS = -g -framework Foundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks -framework JavaNativeFoundation -framework Security -framework CoreFoundation | |
58 #objc compiler blows up on -march=i586, perhaps it should not be included in the macosx intel 32-bit C++ compiles? | |
59 SAARCH = $(subst -march=i586,,$(ARCHFLAG)) | |
60 else | |
61 SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c | |
62 SALIBS = | |
63 SAARCH = $(ARCHFLAG) | |
64 endif | |
65 endif | |
57 | 66 |
58 SAMAPFILE = $(SASRCDIR)/mapfile | 67 SAMAPFILE = $(SASRCDIR)/mapfile |
59 | 68 |
60 DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC) | 69 DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC) |
61 | 70 |
77 ifneq ($(OS_VENDOR), Darwin) | 86 ifneq ($(OS_VENDOR), Darwin) |
78 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) | 87 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) |
79 endif | 88 endif |
80 SA_LFLAGS += $(LDFLAGS_HASH_STYLE) | 89 SA_LFLAGS += $(LDFLAGS_HASH_STYLE) |
81 | 90 |
91 ifeq ($(OS_VENDOR), Darwin) | |
92 BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \ | |
93 -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") \ | |
94 -I/System/Library/Frameworks/JavaVM.framework/Headers | |
95 else | |
96 BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \ | |
97 -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") | |
98 endif | |
99 | |
82 $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE) | 100 $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE) |
83 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ | 101 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ |
84 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ | 102 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ |
85 exit 1; \ | 103 exit 1; \ |
86 fi | 104 fi |
87 @echo Making SA debugger back-end... | 105 @echo Making SA debugger back-end... |
88 $(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \ | 106 $(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \ |
89 $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ | 107 $(SYMFLAG) $(SAARCH) $(SHARED_FLAG) $(PICFLAG) \ |
90 -I$(SASRCDIR) \ | 108 -I$(SASRCDIR) \ |
91 -I$(GENERATED) \ | 109 -I$(GENERATED) \ |
92 -I$(BOOT_JAVA_HOME)/include \ | 110 $(BOOT_JAVA_INCLUDES) \ |
93 -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") \ | |
94 $(SASRCFILES) \ | 111 $(SASRCFILES) \ |
95 $(SA_LFLAGS) \ | 112 $(SA_LFLAGS) \ |
96 $(SA_DEBUG_CFLAGS) \ | 113 $(SA_DEBUG_CFLAGS) \ |
97 -o $@ \ | 114 -o $@ \ |
98 $(SALIBS) | 115 $(SALIBS) |