Mercurial > hg > truffle
comparison make/linux/makefiles/vm.make @ 1123:167c2986d91b
6843629: Make current hotspot build part of jdk5 control build
Summary: Source changes for older compilers plus makefile changes.
Reviewed-by: xlu
author | phh |
---|---|
date | Wed, 16 Dec 2009 12:54:49 -0500 |
parents | 354d3184f6b2 |
children | 7de45b5044c3 |
comparison
equal
deleted
inserted
replaced
1122:dcb15a6f342d | 1123:167c2986d91b |
---|---|
111 include $(MAKEFILES_DIR)/dtrace.make | 111 include $(MAKEFILES_DIR)/dtrace.make |
112 | 112 |
113 #---------------------------------------------------------------------- | 113 #---------------------------------------------------------------------- |
114 # JVM | 114 # JVM |
115 | 115 |
116 JVM = jvm$(G_SUFFIX) | 116 JVM = jvm |
117 LIBJVM = lib$(JVM).so | 117 LIBJVM = lib$(JVM).so |
118 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so | |
118 | 119 |
119 JVM_OBJ_FILES = $(Obj_Files) | 120 JVM_OBJ_FILES = $(Obj_Files) |
120 | 121 |
121 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES)) | 122 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES)) |
122 | 123 |
199 $(LINK_LIB.CC/PRE_HOOK) \ | 200 $(LINK_LIB.CC/PRE_HOOK) \ |
200 $(LINK_VM) $(LD_SCRIPT_FLAG) \ | 201 $(LINK_VM) $(LD_SCRIPT_FLAG) \ |
201 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ | 202 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ |
202 $(LINK_LIB.CC/POST_HOOK) \ | 203 $(LINK_LIB.CC/POST_HOOK) \ |
203 rm -f $@.1; ln -s $@ $@.1; \ | 204 rm -f $@.1; ln -s $@ $@.1; \ |
205 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ | |
204 if [ -x /usr/sbin/selinuxenabled ] ; then \ | 206 if [ -x /usr/sbin/selinuxenabled ] ; then \ |
205 /usr/sbin/selinuxenabled; \ | 207 /usr/sbin/selinuxenabled; \ |
206 if [ $$? = 0 ] ; then \ | 208 if [ $$? = 0 ] ; then \ |
207 /usr/bin/chcon -t textrel_shlib_t $@; \ | 209 /usr/bin/chcon -t textrel_shlib_t $@; \ |
208 if [ $$? != 0 ]; then \ | 210 if [ $$? != 0 ]; then \ |