equal
deleted
inserted
replaced
58 # set INCLUDES for C preprocessor. |
58 # set INCLUDES for C preprocessor. |
59 Src_Dirs_I += $(GENERATED) |
59 Src_Dirs_I += $(GENERATED) |
60 # The order is important for the precompiled headers to work. |
60 # The order is important for the precompiled headers to work. |
61 INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%) |
61 INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%) |
62 |
62 |
63 ifeq (${VERSION}, debug) |
63 # SYMFLAG is used by {jsig,saproc}.make |
|
64 ifneq ($(OBJCOPY),) |
|
65 # always build with debug info when we can create .debuginfo files |
64 SYMFLAG = -g |
66 SYMFLAG = -g |
65 else |
67 else |
66 SYMFLAG = |
68 ifeq (${VERSION}, debug) |
|
69 SYMFLAG = -g |
|
70 else |
|
71 SYMFLAG = |
|
72 endif |
67 endif |
73 endif |
68 |
74 |
69 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined |
75 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined |
70 # in $(GAMMADIR)/make/defs.make |
76 # in $(GAMMADIR)/make/defs.make |
71 ifeq ($(HOTSPOT_BUILD_VERSION),) |
77 ifeq ($(HOTSPOT_BUILD_VERSION),) |
121 # JVM |
127 # JVM |
122 |
128 |
123 JVM = jvm |
129 JVM = jvm |
124 LIBJVM = lib$(JVM).so |
130 LIBJVM = lib$(JVM).so |
125 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so |
131 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so |
|
132 |
|
133 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo |
|
134 LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo |
126 |
135 |
127 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt |
136 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt |
128 |
137 |
129 SOURCE_PATHS=\ |
138 SOURCE_PATHS=\ |
130 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ |
139 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ |
305 fi \ |
314 fi \ |
306 fi \ |
315 fi \ |
307 fi \ |
316 fi \ |
308 fi \ |
317 fi \ |
309 } |
318 } |
310 |
319 ifeq ($(CROSS_COMPILE_ARCH),) |
311 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) |
320 ifneq ($(OBJCOPY),) |
|
321 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) |
|
322 $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ |
|
323 ifeq ($(STRIP_POLICY),all_strip) |
|
324 $(QUIETLY) $(STRIP) $@ |
|
325 else |
|
326 ifeq ($(STRIP_POLICY),min_strip) |
|
327 $(QUIETLY) $(STRIP) -g $@ |
|
328 # implied else here is no stripping at all |
|
329 endif |
|
330 endif |
|
331 $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) |
|
332 endif |
|
333 endif |
|
334 |
|
335 DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR) |
|
336 DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM) |
|
337 DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO) |
312 |
338 |
313 install_jvm: $(LIBJVM) |
339 install_jvm: $(LIBJVM) |
314 @echo "Copying $(LIBJVM) to $(DEST_JVM)" |
340 @echo "Copying $(LIBJVM) to $(DEST_JVM)" |
|
341 $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \ |
|
342 cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO) |
315 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done" |
343 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done" |
316 |
344 |
317 #---------------------------------------------------------------------- |
345 #---------------------------------------------------------------------- |
318 # Other files |
346 # Other files |
319 |
347 |