diff make/linux/makefiles/vm.make @ 4189:2f82d59ddf61

Merge jdk7u12-b03
author andrew
date Fri, 30 Nov 2012 12:17:17 +0000
parents 807df5d59cd5 b9d9ae5d5525
children 6e4feb17117d
line wrap: on
line diff
--- a/make/linux/makefiles/vm.make	Mon Nov 05 17:00:55 2012 +0000
+++ b/make/linux/makefiles/vm.make	Fri Nov 30 12:17:17 2012 +0000
@@ -42,7 +42,7 @@
 -include $(DEP_DIR)/*.d
 
 # read machine-specific adjustments (%%% should do this via buildtree.make?)
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
   include $(MAKEFILES_DIR)/zeroshark.make
 else
   include $(MAKEFILES_DIR)/$(BUILDARCH).make
@@ -251,7 +251,7 @@
 	sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
 
 ifeq ($(STATIC_CXX),)
-  ifeq ($(SHARK_BUILD), true)
+  ifeq ($(JVM_VARIANT_ZEROSHARK), true)
     STATIC_CXX = false
   else
     ifeq ($(ZERO_LIBARCH), ppc64)
@@ -284,12 +284,12 @@
 
   LIBS_VM                  += $(LIBS)
 endif
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(JVM_VARIANT_ZERO), true)
   LIBS_VM += $(LIBFFI_LIBS)
 endif
-ifeq ($(SHARK_BUILD), true)
+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+  LIBS_VM   += $(LIBFFI_LIBS) $(LLVM_LIBS)
   LFLAGS_VM += $(LLVM_LDFLAGS)
-  LIBS_VM   += $(LLVM_LIBS)
 endif
 
 LINK_VM = $(LINK_LIB.CC)
@@ -346,30 +346,29 @@
 	      fi                                                        \
             fi 								\
 	}
-ifeq ($(CROSS_COMPILE_ARCH),)
-  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-    ifneq ($(STRIP_POLICY),no_strip)
-	$(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
-	$(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
-    endif
-    ifeq ($(STRIP_POLICY),all_strip)
-	$(QUIETLY) $(STRIP) $@
-    else
-      ifeq ($(STRIP_POLICY),min_strip)
-	$(QUIETLY) $(STRIP) -g $@
-      # implied else here is no stripping at all
-      endif
-    endif
+
+ 	ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+    	     ifneq ($(STRIP_POLICY),no_strip)
+	     	   $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
+		   $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+  	     endif
+    	     ifeq ($(STRIP_POLICY),all_strip)
+	     	  $(QUIETLY) $(STRIP) $@
+    	     else
+    	     ifeq ($(STRIP_POLICY),min_strip)
+	     	  $(QUIETLY) $(STRIP) -g $@
+    		  # implied else here is no stripping at all
+    	     endif
+    	     endif
+ 	endif
 	$(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
-    ifeq ($(ZIP_DEBUGINFO_FILES),1)
-      ifneq ($(STRIP_POLICY),no_strip)
-	$(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
-	$(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
-	[ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); }
-      endif
-    endif
-  endif
-endif
+ 	ifeq ($(ZIP_DEBUGINFO_FILES),1)
+   	     ifneq ($(STRIP_POLICY),no_strip)
+  	     	   $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+		   $(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+		   [ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); }
+   	     endif
+ 	endif
 
 DEST_SUBDIR        = $(JDK_LIBDIR)/$(VM_SUBDIR)
 DEST_JVM           = $(DEST_SUBDIR)/$(LIBJVM)
@@ -396,9 +395,12 @@
 # Serviceability agent
 include $(MAKEFILES_DIR)/saproc.make
 
+# Whitebox testing API
+include $(MAKEFILES_DIR)/wb.make
+
 #----------------------------------------------------------------------
 
-build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) dtraceCheck
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) $(WB_JAR) dtraceCheck
 
 install: install_jvm install_jsig install_saproc