Mercurial > hg > release > icedtea6-1.13
changeset 2954:55c6b6c6e0af
S7010849: 5/5 Extraneous javac source/target options when building sa-jdi
2013-02-04 Andrew John Hughes <gnu.andrew@redhat.com>
Omair Majid <omajid@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add 7010849 backport.
(ICEDTEA_ECJ_PATCHES): Remove 7010849 backport.
* patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch: Rename to ...
* patches/openjdk/7010849-modernise_sa.patch: New file.
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Mon, 04 Feb 2013 00:59:08 -0500 |
parents | 9cda95ffca83 |
children | 7b540332f735 |
files | ChangeLog Makefile.am NEWS patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch patches/openjdk/7010849-modernise_sa.patch |
diffstat | 5 files changed, 406 insertions(+), 396 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 13 18:16:50 2013 +0000 +++ b/ChangeLog Mon Feb 04 00:59:08 2013 -0500 @@ -1,3 +1,12 @@ +2013-02-04 Andrew John Hughes <gnu.andrew@redhat.com> + Omair Majid <omajid@redhat.com> + + * Makefile.am: + (ICEDTEA_PATCHES): Add 7010849 backport. + (ICEDTEA_ECJ_PATCHES): Remove 7010849 backport. + * patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch: Rename to ... + * patches/openjdk/7010849-modernise_sa.patch: New file. + 2013-02-13 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: Add latest security fixes.
--- a/Makefile.am Wed Feb 13 18:16:50 2013 +0000 +++ b/Makefile.am Mon Feb 04 00:59:08 2013 -0500 @@ -499,7 +499,8 @@ patches/openjdk/6763340-corba_memory_leak.patch \ patches/openjdk/6980681-corba_deadlock.patch \ patches/openjdk/7162902-corba_fixes.patch \ - patches/traceable.patch + patches/traceable.patch \ + patches/openjdk/7010849-modernise_sa.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -556,7 +557,6 @@ # Bootstrapping patches ICEDTEA_ECJ_PATCHES = \ - patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch \ patches/ecj/icedtea.patch \ patches/ecj/javafiles.patch \ patches/ecj/spp.patch \
--- a/NEWS Wed Feb 13 18:16:50 2013 +0000 +++ b/NEWS Mon Feb 04 00:59:08 2013 -0500 @@ -101,6 +101,7 @@ * SystemTap - Addition of garbage collection probes + New in release 1.11.5 (2012-10-16): * Security fixes
--- a/patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch Wed Feb 13 18:16:50 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,394 +0,0 @@ -# HG changeset patch -# User andrew -# Date 1301696137 25200 -# Node ID 37be97a5839376b2d2fa1d2ac1ab3a6cbe0653d0 -# Parent b025bffd6c2ca81c7c08f0dd2f4b2e0ba3223c05 -7010849: 5/5 Extraneous javac source/target options when building sa-jdi -Summary: Make code changes necessary to get rid of the '-source 1.4 -target 1.4' options. -Reviewed-by: dholmes, dcubed - -diff --git a/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java b/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -55,7 +55,7 @@ - synchronized(lock) { - if (useMethodInvoke) { - try { -- Method method = HelloWorld.class.getMethod("e", null); -+ Method method = HelloWorld.class.getMethod("e"); - Integer result = (Integer) method.invoke(null, new Object[0]); - return result.intValue(); - } -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -52,12 +52,10 @@ - return intValue(); - } - -- public int compareTo(Object obj) { -- byte other = ((ByteValue)obj).value(); -- return value() - other; -+ public int compareTo(ByteValue byteVal) { -+ return value() - byteVal.value(); - } - -- - public Type type() { - return vm.theByteType(); - } -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -52,9 +52,8 @@ - return intValue(); - } - -- public int compareTo(Object obj) { -- char other = ((CharValue)obj).value(); -- return value() - other; -+ public int compareTo(CharValue charVal) { -+ return value() - charVal.value(); - } - - public Type type() { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -186,7 +186,7 @@ - // assert isVMVersionMismatch(throwable), "not a VMVersionMismatch" - Class expClass = throwable.getClass(); - Method targetVersionMethod = expClass.getMethod("getTargetVersion", new Class[0]); -- return (String) targetVersionMethod.invoke(throwable, null); -+ return (String) targetVersionMethod.invoke(throwable); - } - - /** If the causal chain has a sun.jvm.hotspot.runtime.VMVersionMismatchException, -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -45,8 +45,8 @@ - } - } - -- public int compareTo(Object obj) { -- double other = ((DoubleValue)obj).value(); -+ public int compareTo(DoubleValue doubleVal) { -+ double other = doubleVal.value(); - if (value() < other) { - return -1; - } else if (value() == other) { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java -@@ -145,8 +145,7 @@ - } - - // From interface Comparable -- public int compareTo(Object object) { -- Field field = (Field)object; -+ public int compareTo(Field field) { - ReferenceTypeImpl declaringType = (ReferenceTypeImpl)declaringType(); - int rc = declaringType.compareTo(field.declaringType()); - if (rc == 0) { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -52,8 +52,8 @@ - return intValue(); - } - -- public int compareTo(Object obj) { -- float other = ((FloatValue)obj).value(); -+ public int compareTo(FloatValue floatVal) { -+ float other = floatVal.value(); - if (value() < other) { - return -1; - } else if (value() == other) { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -52,9 +52,8 @@ - return intValue(); - } - -- public int compareTo(Object obj) { -- int other = ((IntegerValue)obj).value(); -- return value() - other; -+ public int compareTo(IntegerValue integerVal) { -+ return value() - integerVal.value(); - } - - public Type type() { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -67,8 +67,8 @@ - return (int)method.hashCode() + slot(); - } - -- public int compareTo(Object object) { -- LocalVariableImpl other = (LocalVariableImpl)object; -+ public int compareTo(LocalVariable localVar) { -+ LocalVariableImpl other = (LocalVariableImpl) localVar; - int rc = method.compareTo(other.method); - if (rc == 0) { - rc = slot() - other.slot(); -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -78,8 +78,7 @@ - return method().hashCode() + (int)codeIndex(); - } - -- public int compareTo(Object object) { -- LocationImpl other = (LocationImpl)object; -+ public int compareTo(Location other) { - int rc = method().compareTo(other.method()); - if (rc == 0) { - long diff = codeIndex() - other.codeIndex(); -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -52,8 +52,8 @@ - return intValue(); - } - -- public int compareTo(Object obj) { -- long other = ((LongValue)obj).value(); -+ public int compareTo(LongValue longVal) { -+ long other = longVal.value(); - if (value() < other) { - return -1; - } else if (value() == other) { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -200,8 +200,7 @@ - } - - // From interface Comparable -- public int compareTo(Object object) { -- Method method = (Method)object; -+ public int compareTo(Method method) { - ReferenceTypeImpl declaringType = (ReferenceTypeImpl)declaringType(); - int rc = declaringType.compareTo(method.declaringType()); - if (rc == 0) { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -99,7 +99,7 @@ - return saKlass.hashCode(); - } - -- public int compareTo(Object object) { -+ public int compareTo(ReferenceType refType) { - /* - * Note that it is critical that compareTo() == 0 - * implies that equals() == true. Otherwise, TreeSet -@@ -108,7 +108,7 @@ - * (Classes of the same name loaded by different class loaders - * or in different VMs must not return 0). - */ -- ReferenceTypeImpl other = (ReferenceTypeImpl)object; -+ ReferenceTypeImpl other = (ReferenceTypeImpl)refType; - int comp = name().compareTo(other.name()); - if (comp == 0) { - Oop rf1 = ref(); -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -52,9 +52,8 @@ - return intValue(); - } - -- public int compareTo(Object obj) { -- short other = ((ShortValue)obj).value(); -- return value() - other; -+ public int compareTo(ShortValue shortVal) { -+ return value() - shortVal.value(); - } - - public Type type() { -diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java ---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java -+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it -@@ -798,12 +798,11 @@ - } - - public String description() { -- String[] versionParts = {"" + vmmgr.majorInterfaceVersion(), -- "" + vmmgr.minorInterfaceVersion(), -- name()}; - return java.text.MessageFormat.format(java.util.ResourceBundle. - getBundle("com.sun.tools.jdi.resources.jdi").getString("version_format"), -- versionParts); -+ "" + vmmgr.majorInterfaceVersion(), -+ "" + vmmgr.minorInterfaceVersion(), -+ name()); - } - - public String version() { -diff --git a/make/linux/makefiles/sa.make b/make/linux/makefiles/sa.make ---- openjdk-ecj/hotspot/make/linux/makefiles/sa.make -+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - # - # This code is free software; you can redistribute it and/or modify it -@@ -97,8 +97,8 @@ - $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) - $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) - -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) - - $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer - $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) -diff --git a/make/solaris/makefiles/sa.make b/make/solaris/makefiles/sa.make ---- openjdk-ecj/hotspot/make/solaris/makefiles/sa.make -+++ openjdk-ecj/hotspot/make/solaris/makefiles/sa.make -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - # - # This code is free software; you can redistribute it and/or modify it -@@ -88,8 +88,8 @@ - $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) - $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) - -- $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) -- $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) -+ $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) -+ $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) - - $(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer - $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) -diff --git a/make/windows/makefiles/sa.make b/make/windows/makefiles/sa.make ---- openjdk-ecj/hotspot/make/windows/makefiles/sa.make -+++ openjdk-ecj/hotspot/make/windows/makefiles/sa.make -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - # - # This code is free software; you can redistribute it and/or modify it -@@ -55,9 +55,9 @@ - $(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\) - @if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR) - @echo ...Building sa-jdi.jar -- @echo ...$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) .... -- @$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\) -- @$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\) -+ @echo ...$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) .... -+ @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\) -+ @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\) - $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer - $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES) - $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7010849-modernise_sa.patch Mon Feb 04 00:59:08 2013 -0500 @@ -0,0 +1,394 @@ +# HG changeset patch +# User andrew +# Date 1301696137 25200 +# Node ID 37be97a5839376b2d2fa1d2ac1ab3a6cbe0653d0 +# Parent b025bffd6c2ca81c7c08f0dd2f4b2e0ba3223c05 +7010849: 5/5 Extraneous javac source/target options when building sa-jdi +Summary: Make code changes necessary to get rid of the '-source 1.4 -target 1.4' options. +Reviewed-by: dholmes, dcubed + +diff --git a/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java b/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -55,7 +55,7 @@ + synchronized(lock) { + if (useMethodInvoke) { + try { +- Method method = HelloWorld.class.getMethod("e", null); ++ Method method = HelloWorld.class.getMethod("e"); + Integer result = (Integer) method.invoke(null, new Object[0]); + return result.intValue(); + } +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -52,12 +52,10 @@ + return intValue(); + } + +- public int compareTo(Object obj) { +- byte other = ((ByteValue)obj).value(); +- return value() - other; ++ public int compareTo(ByteValue byteVal) { ++ return value() - byteVal.value(); + } + +- + public Type type() { + return vm.theByteType(); + } +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -52,9 +52,8 @@ + return intValue(); + } + +- public int compareTo(Object obj) { +- char other = ((CharValue)obj).value(); +- return value() - other; ++ public int compareTo(CharValue charVal) { ++ return value() - charVal.value(); + } + + public Type type() { +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -186,7 +186,7 @@ + // assert isVMVersionMismatch(throwable), "not a VMVersionMismatch" + Class expClass = throwable.getClass(); + Method targetVersionMethod = expClass.getMethod("getTargetVersion", new Class[0]); +- return (String) targetVersionMethod.invoke(throwable, null); ++ return (String) targetVersionMethod.invoke(throwable); + } + + /** If the causal chain has a sun.jvm.hotspot.runtime.VMVersionMismatchException, +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -45,8 +45,8 @@ + } + } + +- public int compareTo(Object obj) { +- double other = ((DoubleValue)obj).value(); ++ public int compareTo(DoubleValue doubleVal) { ++ double other = doubleVal.value(); + if (value() < other) { + return -1; + } else if (value() == other) { +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java +@@ -145,8 +145,7 @@ + } + + // From interface Comparable +- public int compareTo(Object object) { +- Field field = (Field)object; ++ public int compareTo(Field field) { + ReferenceTypeImpl declaringType = (ReferenceTypeImpl)declaringType(); + int rc = declaringType.compareTo(field.declaringType()); + if (rc == 0) { +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -52,8 +52,8 @@ + return intValue(); + } + +- public int compareTo(Object obj) { +- float other = ((FloatValue)obj).value(); ++ public int compareTo(FloatValue floatVal) { ++ float other = floatVal.value(); + if (value() < other) { + return -1; + } else if (value() == other) { +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -52,9 +52,8 @@ + return intValue(); + } + +- public int compareTo(Object obj) { +- int other = ((IntegerValue)obj).value(); +- return value() - other; ++ public int compareTo(IntegerValue integerVal) { ++ return value() - integerVal.value(); + } + + public Type type() { +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -67,8 +67,8 @@ + return (int)method.hashCode() + slot(); + } + +- public int compareTo(Object object) { +- LocalVariableImpl other = (LocalVariableImpl)object; ++ public int compareTo(LocalVariable localVar) { ++ LocalVariableImpl other = (LocalVariableImpl) localVar; + int rc = method.compareTo(other.method); + if (rc == 0) { + rc = slot() - other.slot(); +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -78,8 +78,7 @@ + return method().hashCode() + (int)codeIndex(); + } + +- public int compareTo(Object object) { +- LocationImpl other = (LocationImpl)object; ++ public int compareTo(Location other) { + int rc = method().compareTo(other.method()); + if (rc == 0) { + long diff = codeIndex() - other.codeIndex(); +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -52,8 +52,8 @@ + return intValue(); + } + +- public int compareTo(Object obj) { +- long other = ((LongValue)obj).value(); ++ public int compareTo(LongValue longVal) { ++ long other = longVal.value(); + if (value() < other) { + return -1; + } else if (value() == other) { +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -200,8 +200,7 @@ + } + + // From interface Comparable +- public int compareTo(Object object) { +- Method method = (Method)object; ++ public int compareTo(Method method) { + ReferenceTypeImpl declaringType = (ReferenceTypeImpl)declaringType(); + int rc = declaringType.compareTo(method.declaringType()); + if (rc == 0) { +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -99,7 +99,7 @@ + return saKlass.hashCode(); + } + +- public int compareTo(Object object) { ++ public int compareTo(ReferenceType refType) { + /* + * Note that it is critical that compareTo() == 0 + * implies that equals() == true. Otherwise, TreeSet +@@ -108,7 +108,7 @@ + * (Classes of the same name loaded by different class loaders + * or in different VMs must not return 0). + */ +- ReferenceTypeImpl other = (ReferenceTypeImpl)object; ++ ReferenceTypeImpl other = (ReferenceTypeImpl)refType; + int comp = name().compareTo(other.name()); + if (comp == 0) { + Oop rf1 = ref(); +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -52,9 +52,8 @@ + return intValue(); + } + +- public int compareTo(Object obj) { +- short other = ((ShortValue)obj).value(); +- return value() - other; ++ public int compareTo(ShortValue shortVal) { ++ return value() - shortVal.value(); + } + + public Type type() { +diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -798,12 +798,11 @@ + } + + public String description() { +- String[] versionParts = {"" + vmmgr.majorInterfaceVersion(), +- "" + vmmgr.minorInterfaceVersion(), +- name()}; + return java.text.MessageFormat.format(java.util.ResourceBundle. + getBundle("com.sun.tools.jdi.resources.jdi").getString("version_format"), +- versionParts); ++ "" + vmmgr.majorInterfaceVersion(), ++ "" + vmmgr.minorInterfaceVersion(), ++ name()); + } + + public String version() { +diff --git a/make/linux/makefiles/sa.make b/make/linux/makefiles/sa.make +--- openjdk/hotspot/make/linux/makefiles/sa.make ++++ openjdk/hotspot/make/linux/makefiles/sa.make +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # + # This code is free software; you can redistribute it and/or modify it +@@ -97,8 +97,8 @@ + $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) + $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) + +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) + + $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer + $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) +diff --git a/make/solaris/makefiles/sa.make b/make/solaris/makefiles/sa.make +--- openjdk/hotspot/make/solaris/makefiles/sa.make ++++ openjdk/hotspot/make/solaris/makefiles/sa.make +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # + # This code is free software; you can redistribute it and/or modify it +@@ -88,8 +88,8 @@ + $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) + $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) + +- $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) +- $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) ++ $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) ++ $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) + + $(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer + $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) +diff --git a/make/windows/makefiles/sa.make b/make/windows/makefiles/sa.make +--- openjdk/hotspot/make/windows/makefiles/sa.make ++++ openjdk/hotspot/make/windows/makefiles/sa.make +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # + # This code is free software; you can redistribute it and/or modify it +@@ -55,9 +55,9 @@ + $(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\) + @if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR) + @echo ...Building sa-jdi.jar +- @echo ...$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) .... +- @$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\) +- @$(COMPILE_JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\) ++ @echo ...$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) .... ++ @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\) ++ @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\) + $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer + $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES) + $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js