Mercurial > hg > graal-compiler

comparison make/bsd/makefiles/vm.make @ 4006:436b4a3231bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ee87cfe2f8f9 94ec88ca68e2
comparison
equal deleted inserted replaced
4005:2ef3386478e6 4006:436b4a3231bf
106 CFLAGS += $(EXTRA_CFLAGS) 106 CFLAGS += $(EXTRA_CFLAGS)
107 LFLAGS += $(EXTRA_CFLAGS) 107 LFLAGS += $(EXTRA_CFLAGS)
108 108
109 # Don't set excutable bit on stack segment 109 # Don't set excutable bit on stack segment
110 # the same could be done by separate execstack command 110 # the same could be done by separate execstack command
111 # Darwin is non-executable-stack by default
111 ifneq ($(OS_VENDOR), Darwin) 112 ifneq ($(OS_VENDOR), Darwin)
112 LFLAGS += -Xlinker -z -Xlinker noexecstack 113 LFLAGS += -Xlinker -z -Xlinker noexecstack
113 endif 114 endif
114 115
115 LIBS += -lm -pthread 116 LIBS += -lm -pthread
320 # Serviceability agent 321 # Serviceability agent
321 include $(MAKEFILES_DIR)/saproc.make 322 include $(MAKEFILES_DIR)/saproc.make
322 323
323 #---------------------------------------------------------------------- 324 #----------------------------------------------------------------------
324 325
326 ifeq ($(OS_VENDOR), Darwin)
327 $(LIBJVM).dSYM: $(LIBJVM)
328 dsymutil $(LIBJVM)
329
330 # no launcher or libjvm_db for macosx
331 build: $(LIBJVM) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM
332 echo "Doing vm.make build:"
333 else
325 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) 334 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
335 endif
326 336
327 install: install_jvm install_jsig install_saproc 337 install: install_jvm install_jsig install_saproc
328 338
329 .PHONY: default build install install_jvm 339 .PHONY: default build install install_jvm