Mercurial > hg > truffle

comparison make/bsd/makefiles/dtrace.make @ 7408:892acf0431ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7153050: remove crufty '_g' support from HotSpot repo makefiles Summary: Phase 1 is removing '_g' support from the Makefiles. Reviewed-by: dcubed, sspitsyn, coleenp, tbell Contributed-by: ron.durbin@oracle.com
author dcubed
date Fri, 14 Dec 2012 10:06:52 -0800
parents d804e148cff8
children 8b46b0196eb0
comparison
equal deleted inserted replaced
7396:4a2ed49abd51 7408:892acf0431ef
36 DtraceOutDir = $(GENERATED)/dtracefiles 36 DtraceOutDir = $(GENERATED)/dtracefiles
37 37
38 # Bsd does not build libjvm_db, does not compile on macosx 38 # Bsd does not build libjvm_db, does not compile on macosx
39 # disabled in build: rule in vm.make 39 # disabled in build: rule in vm.make
40 JVM_DB = libjvm_db 40 JVM_DB = libjvm_db
41 #LIBJVM_DB = libjvm_db.dylib 41 LIBJVM_DB = libjvm_db.dylib
42 LIBJVM_DB = libjvm$(G_SUFFIX)_db.dylib
43 42
44 JVM_DTRACE = jvm_dtrace 43 JVM_DTRACE = jvm_dtrace
45 #LIBJVM_DTRACE = libjvm_dtrace.dylib 44 LIBJVM_DTRACE = libjvm_dtrace.dylib
46 LIBJVM_DTRACE = libjvm$(G_SUFFIX)_dtrace.dylib
47 45
48 JVMOFFS = JvmOffsets 46 JVMOFFS = JvmOffsets
49 JVMOFFS.o = $(JVMOFFS).o 47 JVMOFFS.o = $(JVMOFFS).o
50 GENOFFS = generate$(JVMOFFS) 48 GENOFFS = generate$(JVMOFFS)
51 49
78 76
79 # Making 64/libjvm_db.so: 64-bit version of libjvm_db.so which handles 32-bit libjvm.so 77 # Making 64/libjvm_db.so: 64-bit version of libjvm_db.so which handles 32-bit libjvm.so
80 ifneq ("${ISA}","${BUILDARCH}") 78 ifneq ("${ISA}","${BUILDARCH}")
81 79
82 XLIBJVM_DB = 64/$(LIBJVM_DB) 80 XLIBJVM_DB = 64/$(LIBJVM_DB)
83 XLIBJVM_DB_G = 64/$(LIBJVM_DB_G)
84 XLIBJVM_DTRACE = 64/$(LIBJVM_DTRACE) 81 XLIBJVM_DTRACE = 64/$(LIBJVM_DTRACE)
85 XLIBJVM_DTRACE_G = 64/$(LIBJVM_DTRACE_G)
86 XARCH = $(subst sparcv9,v9,$(shell echo $(ISA))) 82 XARCH = $(subst sparcv9,v9,$(shell echo $(ISA)))
87 83
88 $(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE) 84 $(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
89 @echo Making $@ 85 @echo Making $@
90 $(QUIETLY) mkdir -p 64/ ; \ 86 $(QUIETLY) mkdir -p 64/ ; \
91 $(CC) $(SYMFLAG) -xarch=$(XARCH) -D$(TYPE) -I. -I$(GENERATED) \ 87 $(CC) $(SYMFLAG) -xarch=$(XARCH) -D$(TYPE) -I. -I$(GENERATED) \
92 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c #-lc 88 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c #-lc
93 # [ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); }
94 89
95 $(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE) 90 $(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
96 @echo Making $@ 91 @echo Making $@
97 $(QUIETLY) mkdir -p 64/ ; \ 92 $(QUIETLY) mkdir -p 64/ ; \
98 $(CC) $(SYMFLAG) -xarch=$(XARCH) -D$(TYPE) -I. \ 93 $(CC) $(SYMFLAG) -xarch=$(XARCH) -D$(TYPE) -I. \
99 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c #-lc -lthread -ldoor 94 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c #-lc -lthread -ldoor
100 # [ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); }
101 95
102 endif # ifneq ("${ISA}","${BUILDARCH}") 96 endif # ifneq ("${ISA}","${BUILDARCH}")
103 97
104 LFLAGS_GENOFFS += -L. 98 LFLAGS_GENOFFS += -L.
105 99
139 133
140 $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE) 134 $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
141 @echo Making $@ 135 @echo Making $@
142 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \ 136 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
143 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -Wall # -lc 137 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -Wall # -lc
144 # [ -f $(LIBJVM_DB_G) ] || { ln -s $@ $(LIBJVM_DB_G); }
145 138
146 $(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE) 139 $(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
147 @echo Making $@ 140 @echo Making $@
148 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \ 141 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \
149 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c #-lc -lthread -ldoor 142 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c #-lc -lthread -ldoor
150 # [ -f $(LIBJVM_DTRACE_G) ] || { ln -s $@ $(LIBJVM_DTRACE_G); }
151 143
152 #$(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \ 144 #$(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \
153 # $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d 145 # $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d
154 # $(QUIETLY) cat $^ > $@ 146 # $(QUIETLY) cat $^ > $@
155 147