comparison make/bsd/makefiles/product.make @ 14521:29ccc4cbabca

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents 5eee9a9aeb7a
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14520:f84115370178 14521:29ccc4cbabca
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 # Sets make macros for making optimized version of Gamma VM 25 # Sets make macros for making optimized version of HotSpot VM
26 # (This is the "product", not the "release" version.) 26 # (This is the "product", not the "release" version.)
27 27
28 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make 28 # Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
29 OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS) 29 OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS)
30 OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@)) 30 OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@))
37 # Set the environment variable HOTSPARC_GENERIC to "true" 37 # Set the environment variable HOTSPARC_GENERIC to "true"
38 # to inhibit the effect of the previous line on CFLAGS. 38 # to inhibit the effect of the previous line on CFLAGS.
39 39
40 # Linker mapfile 40 # Linker mapfile
41 MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-product 41 MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-product
42 ifeq ($(OS_VENDOR), Darwin)
43 MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-darwin-product
44 endif
42 45
43 SYSDEFS += -DPRODUCT 46 SYSDEFS += -DPRODUCT
44 VERSION = optimized 47 VERSION = optimized
45 48
46 ifneq ($(OS_VENDOR), Darwin) 49 ifneq ($(OS_VENDOR), Darwin)