Mercurial > hg > truffle
comparison make/linux/makefiles/vm.make @ 1681:126ea7725993
6953477: Increase portability and flexibility of building Hotspot
Summary: A collection of portability improvements including shared code support for PPC, ARM platforms, software floating point, cross compilation support and improvements in error crash detail.
Reviewed-by: phh, never, coleenp, dholmes
author | bobv |
---|---|
date | Tue, 03 Aug 2010 08:13:38 -0400 |
parents | c18cbe5936b8 |
children | d2ede61b7a12 |
comparison
equal
deleted
inserted
replaced
1680:a64438a2b7e8 | 1681:126ea7725993 |
---|---|
96 # Do not use C++ exception handling | 96 # Do not use C++ exception handling |
97 CFLAGS += $(CFLAGS/NOEX) | 97 CFLAGS += $(CFLAGS/NOEX) |
98 | 98 |
99 # Extra flags from gnumake's invocation or environment | 99 # Extra flags from gnumake's invocation or environment |
100 CFLAGS += $(EXTRA_CFLAGS) | 100 CFLAGS += $(EXTRA_CFLAGS) |
101 LFLAGS += $(EXTRA_CFLAGS) | |
101 | 102 |
102 LIBS += -lm -ldl -lpthread | 103 LIBS += -lm -ldl -lpthread |
103 | 104 |
104 # By default, link the *.o into the library, not the executable. | 105 # By default, link the *.o into the library, not the executable. |
105 LINK_INTO$(LINK_INTO) = LIBJVM | 106 LINK_INTO$(LINK_INTO) = LIBJVM |
208 $(LINK_VM) $(LD_SCRIPT_FLAG) \ | 209 $(LINK_VM) $(LD_SCRIPT_FLAG) \ |
209 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ | 210 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ |
210 $(LINK_LIB.CC/POST_HOOK) \ | 211 $(LINK_LIB.CC/POST_HOOK) \ |
211 rm -f $@.1; ln -s $@ $@.1; \ | 212 rm -f $@.1; ln -s $@ $@.1; \ |
212 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ | 213 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ |
213 if [ -x /usr/sbin/selinuxenabled ] ; then \ | 214 if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \ |
214 /usr/sbin/selinuxenabled; \ | 215 if [ -x /usr/sbin/selinuxenabled ] ; then \ |
215 if [ $$? = 0 ] ; then \ | 216 /usr/sbin/selinuxenabled; \ |
216 /usr/bin/chcon -t textrel_shlib_t $@; \ | 217 if [ $$? = 0 ] ; then \ |
217 if [ $$? != 0 ]; then \ | 218 /usr/bin/chcon -t textrel_shlib_t $@; \ |
218 echo "ERROR: Cannot chcon $@"; \ | 219 if [ $$? != 0 ]; then \ |
219 fi \ | 220 echo "ERROR: Cannot chcon $@"; \ |
220 fi \ | 221 fi \ |
221 fi \ | 222 fi \ |
223 fi \ | |
224 fi \ | |
222 } | 225 } |
223 | 226 |
224 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) | 227 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) |
225 | 228 |
226 install_jvm: $(LIBJVM) | 229 install_jvm: $(LIBJVM) |