1.1 --- a/agent/make/Makefile Fri Nov 09 08:36:17 2012 -0800
1.2 +++ b/agent/make/Makefile Mon Nov 12 14:03:53 2012 -0800
1.3 @@ -58,10 +58,8 @@
1.4 sun.jvm.hotspot.debugger.cdbg.basic.amd64 \
1.5 sun.jvm.hotspot.debugger.cdbg.basic.x86 \
1.6 sun.jvm.hotspot.debugger.dummy \
1.7 -sun.jvm.hotspot.debugger.ia64 \
1.8 sun.jvm.hotspot.debugger.linux \
1.9 sun.jvm.hotspot.debugger.linux.amd64 \
1.10 -sun.jvm.hotspot.debugger.linux.ia64 \
1.11 sun.jvm.hotspot.debugger.linux.x86 \
1.12 sun.jvm.hotspot.debugger.posix \
1.13 sun.jvm.hotspot.debugger.posix.elf \
1.14 @@ -77,7 +75,6 @@
1.15 sun.jvm.hotspot.debugger.win32.coff \
1.16 sun.jvm.hotspot.debugger.windbg \
1.17 sun.jvm.hotspot.debugger.windbg.amd64 \
1.18 -sun.jvm.hotspot.debugger.windbg.ia64 \
1.19 sun.jvm.hotspot.debugger.windbg.x86 \
1.20 sun.jvm.hotspot.debugger.x86 \
1.21 sun.jvm.hotspot.gc_implementation \
1.22 @@ -97,10 +94,8 @@
1.23 sun.jvm.hotspot.runtime.bsd \
1.24 sun.jvm.hotspot.runtime.bsd_amd64 \
1.25 sun.jvm.hotspot.runtime.bsd_x86 \
1.26 -sun.jvm.hotspot.runtime.ia64 \
1.27 sun.jvm.hotspot.runtime.linux \
1.28 sun.jvm.hotspot.runtime.linux_amd64 \
1.29 -sun.jvm.hotspot.runtime.linux_ia64 \
1.30 sun.jvm.hotspot.runtime.linux_sparc \
1.31 sun.jvm.hotspot.runtime.linux_x86 \
1.32 sun.jvm.hotspot.runtime.posix \
1.33 @@ -109,7 +104,6 @@
1.34 sun.jvm.hotspot.runtime.solaris_x86 \
1.35 sun.jvm.hotspot.runtime.sparc \
1.36 sun.jvm.hotspot.runtime.win32_amd64 \
1.37 -sun.jvm.hotspot.runtime.win32_ia64 \
1.38 sun.jvm.hotspot.runtime.win32_x86 \
1.39 sun.jvm.hotspot.runtime.x86 \
1.40 sun.jvm.hotspot.tools \
1.41 @@ -152,7 +146,6 @@
1.42 sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
1.43 sun/jvm/hotspot/debugger/cdbg/basic/x86/*.java \
1.44 sun/jvm/hotspot/debugger/dummy/*.java \
1.45 -sun/jvm/hotspot/debugger/ia64/*.java \
1.46 sun/jvm/hotspot/debugger/linux/*.java \
1.47 sun/jvm/hotspot/debugger/linux/x86/*.java \
1.48 sun/jvm/hotspot/debugger/posix/*.java \
1.49 @@ -168,7 +161,6 @@
1.50 sun/jvm/hotspot/debugger/sparc/*.java \
1.51 sun/jvm/hotspot/debugger/win32/coff/*.java \
1.52 sun/jvm/hotspot/debugger/windbg/*.java \
1.53 -sun/jvm/hotspot/debugger/windbg/ia64/*.java \
1.54 sun/jvm/hotspot/debugger/windbg/x86/*.java \
1.55 sun/jvm/hotspot/debugger/x86/*.java \
1.56 sun/jvm/hotspot/gc_implementation/g1/*.java \
1.57 @@ -186,10 +178,8 @@
1.58 sun/jvm/hotspot/runtime/bsd/*.java \
1.59 sun/jvm/hotspot/runtime/bsd_amd64/*.java \
1.60 sun/jvm/hotspot/runtime/bsd_x86/*.java \
1.61 -sun/jvm/hotspot/runtime/ia64/*.java \
1.62 sun/jvm/hotspot/runtime/linux/*.java \
1.63 sun/jvm/hotspot/runtime/linux_amd64/*.java \
1.64 -sun/jvm/hotspot/runtime/linux_ia64/*.java \
1.65 sun/jvm/hotspot/runtime/linux_sparc/*.java \
1.66 sun/jvm/hotspot/runtime/linux_x86/*.java \
1.67 sun/jvm/hotspot/runtime/posix/*.java \
1.68 @@ -198,7 +188,6 @@
1.69 sun/jvm/hotspot/runtime/solaris_x86/*.java \
1.70 sun/jvm/hotspot/runtime/sparc/*.java \
1.71 sun/jvm/hotspot/runtime/win32_amd64/*.java \
1.72 -sun/jvm/hotspot/runtime/win32_ia64/*.java \
1.73 sun/jvm/hotspot/runtime/win32_x86/*.java \
1.74 sun/jvm/hotspot/runtime/x86/*.java \
1.75 sun/jvm/hotspot/tools/*.java \
1.76 @@ -258,6 +247,7 @@
1.77
1.78 SA_PROPERTIES = $(OUTPUT_DIR)/sa.properties
1.79 JAVAC = $(JDK_HOME)/bin/javac
1.80 +JAVA = $(JDK_HOME)/bin/java
1.81 JAVADOC = $(JDK_HOME)/bin/javadoc
1.82 RMIC = $(JDK_HOME)/bin/rmic
1.83
1.84 @@ -298,7 +288,7 @@
1.85
1.86 .PHONY: natives
1.87 natives:
1.88 - cd ../src/os/`java -classpath $(OUTPUT_DIR) sun.jvm.hotspot.utilities.PlatformInfo`; $(MAKE) all
1.89 + cd ../src/os/`$(JAVA) -classpath $(OUTPUT_DIR) sun.jvm.hotspot.utilities.PlatformInfo`; $(MAKE) all
1.90
1.91 .PHONY: sa-jdi.jar
1.92 sa-jdi.jar:
1.93 @@ -323,5 +313,5 @@
1.94
1.95 clean::
1.96 rm -rf filelist
1.97 - cd ../src/os/`java -classpath $(OUTPUT_DIR) sun.jvm.hotspot.utilities.PlatformInfo`; $(MAKE) clean
1.98 + cd ../src/os/`$(JAVA) -classpath $(OUTPUT_DIR) sun.jvm.hotspot.utilities.PlatformInfo`; $(MAKE) clean
1.99 rm -rf $(BUILD_DIR)/*
