Mercurial > hg > truffle
comparison make/linux/makefiles/vm.make @ 7408:892acf0431ef
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 | 857f3ce858dd |
children | 989155e2d07a e7e9e08147fc |
comparison
equal
deleted
inserted
replaced
7396:4a2ed49abd51 | 7408:892acf0431ef |
---|---|
136 #---------------------------------------------------------------------- | 136 #---------------------------------------------------------------------- |
137 # JVM | 137 # JVM |
138 | 138 |
139 JVM = jvm | 139 JVM = jvm |
140 LIBJVM = lib$(JVM).so | 140 LIBJVM = lib$(JVM).so |
141 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so | |
142 | 141 |
143 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo | 142 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo |
144 LIBJVM_DIZ = lib$(JVM).diz | 143 LIBJVM_DIZ = lib$(JVM).diz |
145 LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo | |
146 LIBJVM_G_DIZ = lib$(JVM)$(G_SUFFIX).diz | |
147 | 144 |
148 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt | 145 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt |
149 | 146 |
150 SOURCE_PATHS=\ | 147 SOURCE_PATHS=\ |
151 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ | 148 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \ |
321 $(LINK_LIB.CXX/PRE_HOOK) \ | 318 $(LINK_LIB.CXX/PRE_HOOK) \ |
322 $(LINK_VM) $(LD_SCRIPT_FLAG) \ | 319 $(LINK_VM) $(LD_SCRIPT_FLAG) \ |
323 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \ | 320 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \ |
324 $(LINK_LIB.CXX/POST_HOOK) \ | 321 $(LINK_LIB.CXX/POST_HOOK) \ |
325 rm -f $@.1; ln -s $@ $@.1; \ | 322 rm -f $@.1; ln -s $@ $@.1; \ |
326 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ | |
327 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \ | 323 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \ |
328 if [ -x /usr/sbin/selinuxenabled ] ; then \ | 324 if [ -x /usr/sbin/selinuxenabled ] ; then \ |
329 /usr/sbin/selinuxenabled; \ | 325 /usr/sbin/selinuxenabled; \ |
330 if [ $$? = 0 ] ; then \ | 326 if [ $$? = 0 ] ; then \ |
331 /usr/bin/chcon -t textrel_shlib_t $@; \ | 327 /usr/bin/chcon -t textrel_shlib_t $@; \ |
346 ifeq ($(STRIP_POLICY),min_strip) | 342 ifeq ($(STRIP_POLICY),min_strip) |
347 $(QUIETLY) $(STRIP) -g $@ | 343 $(QUIETLY) $(STRIP) -g $@ |
348 # implied else here is no stripping at all | 344 # implied else here is no stripping at all |
349 endif | 345 endif |
350 endif | 346 endif |
351 $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) | |
352 ifeq ($(ZIP_DEBUGINFO_FILES),1) | 347 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
353 $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) | 348 $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) |
354 $(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) | 349 $(RM) $(LIBJVM_DEBUGINFO) |
355 [ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); } | |
356 endif | 350 endif |
357 endif | 351 endif |
358 | 352 |
359 DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR) | 353 DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR) |
360 DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM) | 354 DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM) |