PING 3: [PATCH FOR REVIEW]: Make source/target options explicit for MakeDeps and jvmti

Andrew John Hughes gnu_andrew at member.fsf.org
Fri Sep 11 09:07:40 PDT 2009 

2009/9/11 John Coomes <John.Coomes at sun.com>:
> Andrew John Hughes (gnu_andrew at member.fsf.org) wrote:
>> > ...
>> > Ok so this sounds like we need to go back to something similar to what
>> > I started with, and patch each individual platform Makefile.  Is that
>> > correct?
>>
>> Here's a revised webrev:
>>
>> http://cr.openjdk.java.net/~andrew/ecj/03/webrev.05/hotspot.patch
>>
>> using rules.make for each platform instead of the top-level defs.make.
>> It also includes the replacement of separate SA flags with just adding
>> the same flags to SA and then following that with -source/target 1.4.
>> Is this ok?
>
> Looks good so far.  I'm trying some builds.
>

Ok, the patch you gave below looks ok to me.  Are you testing with
this patched version?
Let me know if it goes ok, and if it does I'll push the patched version.

>> >> Also, in prior email I suggested:
>> >>
>> >>> ..., if you update JAVAC_COMPILE to include BOOTSTRAP_JAVAC_FLAGS (or
>> >>> whatever it is), and the SA makefile also includes -source/-target
>> >>> options on the command-line, the latter will override the ones in
>> >>> BOOTSTRAP_JAVAC_FLAGS (the SA command line may need to include both
>> >>> -source and -target).  At least try it, I think it'll be a simpler change.
>> >>
>> >
>> > Ok, I must have missed this.  It sounds a good idea and in the long
>> > term I presume we want to get rid of the SA overrides anyway.
>
> That's closer, but not exactly what I was suggesting.  Here's a patch
> to apply on top of your patch.  Basically, it includes
> BOOTSTRAP_JAVAC_FLAGS in COMPILE.JAVAC (COMPILE_JAVAC on windows).
>
> -John
>
>
> # HG changeset patch
> # User jcoomes
> # Date 1252627237 25200
>
> diff --git a/make/linux/makefiles/jvmti.make b/make/linux/makefiles/jvmti.make
> --- a/make/linux/makefiles/jvmti.make
> +++ b/make/linux/makefiles/jvmti.make
> @@ -70,10 +70,10 @@
>  both = $(JvmtiGenClass) $(JvmtiSrcDir)/jvmti.xml $(JvmtiSrcDir)/jvmtiLib.xsl
>
>  $(JvmtiGenClass): $(JvmtiGenSource)
> -       $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -d $(JvmtiOutDir) $(JvmtiGenSource)
> +       $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
>
>  $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
> -       $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
> +       $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
>
>  $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
>        @echo Generating $@
> diff --git a/make/linux/makefiles/rules.make b/make/linux/makefiles/rules.make
> --- a/make/linux/makefiles/rules.make
> +++ b/make/linux/makefiles/rules.make
> @@ -122,6 +122,8 @@
>  endif
>  endif
>
> +COMPILE.JAVAC += $(BOOTSTRAP_JAVAC_FLAGS)
> +
>  SUM = /usr/bin/sum
>
>  # 'gmake MAKE_VERBOSE=y' gives all the gory details.
> diff --git a/make/linux/makefiles/sa.make b/make/linux/makefiles/sa.make
> --- a/make/linux/makefiles/sa.make
> +++ b/make/linux/makefiles/sa.make
> @@ -74,8 +74,8 @@
>          mkdir -p $(SA_CLASSDIR);        \
>        fi
>
> -       $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
> -       $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
> +       $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
> +       $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
>
>        $(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/linux/makefiles/top.make b/make/linux/makefiles/top.make
> --- a/make/linux/makefiles/top.make
> +++ b/make/linux/makefiles/top.make
> @@ -114,7 +114,7 @@
>  # make makeDeps: (and zap the cached db files to force a nonincremental run)
>
>  $(GENERATED)/$(MakeDepsClass): $(MakeDepsSources)
> -       @$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps $(BOOTSTRAP_JAVAC_FLAGS) -d $(GENERATED) $(MakeDepsSources)
> +       @$(REMOTE) $(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources)
>        @echo Removing $(Incremental_Lists) to force regeneration.
>        @rm -f $(Incremental_Lists)
>        @$(CDG) echo >$(Cached_plat)
> diff --git a/make/solaris/makefiles/jvmti.make b/make/solaris/makefiles/jvmti.make
> --- a/make/solaris/makefiles/jvmti.make
> +++ b/make/solaris/makefiles/jvmti.make
> @@ -69,10 +69,10 @@
>  both = $(JvmtiGenClass) $(JvmtiSrcDir)/jvmti.xml $(JvmtiSrcDir)/jvmtiLib.xsl
>
>  $(JvmtiGenClass): $(JvmtiGenSource)
> -       $(QUIETLY) $(COMPILE.JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -d $(JvmtiOutDir) $(JvmtiGenSource)
> +       $(QUIETLY) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
>
>  $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
> -       $(QUIETLY) $(COMPILE.JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
> +       $(QUIETLY) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
>
>  $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
>        @echo Generating $@
> diff --git a/make/solaris/makefiles/rules.make b/make/solaris/makefiles/rules.make
> --- a/make/solaris/makefiles/rules.make
> +++ b/make/solaris/makefiles/rules.make
> @@ -122,6 +122,8 @@
>  endif
>  endif
>
> +COMPILE.JAVAC += $(BOOTSTRAP_JAVAC_FLAGS)
> +
>  SUM = /usr/bin/sum
>
>  # 'gmake MAKE_VERBOSE=y' gives all the gory details.
> diff --git a/make/solaris/makefiles/sa.make b/make/solaris/makefiles/sa.make
> --- a/make/solaris/makefiles/sa.make
> +++ b/make/solaris/makefiles/sa.make
> @@ -67,9 +67,9 @@
>        $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
>          mkdir -p $(SA_CLASSDIR);        \
>        fi
> -       $(QUIETLY) $(COMPILE.JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
> -       $(QUIETLY) $(COMPILE.JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
> -
> +       $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
> +       $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
> +
>        $(QUIETLY) $(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
> diff --git a/make/solaris/makefiles/top.make b/make/solaris/makefiles/top.make
> --- a/make/solaris/makefiles/top.make
> +++ b/make/solaris/makefiles/top.make
> @@ -112,7 +112,7 @@
>  # make makeDeps: (and zap the cached db files to force a nonincremental run)
>
>  $(GENERATED)/$(MakeDepsClass): $(MakeDepsSources)
> -       @$(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps $(BOOTSTRAP_JAVAC_FLAGS) -d $(GENERATED) $(MakeDepsSources)
> +       @$(COMPILE.JAVAC) -classpath $(GAMMADIR)/src/share/tools/MakeDeps -d $(GENERATED) $(MakeDepsSources)
>        @echo Removing $(Incremental_Lists) to force regeneration.
>        @rm -f $(Incremental_Lists)
>        @$(CDG) echo >$(Cached_plat)
> diff --git a/make/windows/makefiles/generated.make b/make/windows/makefiles/generated.make
> --- a/make/windows/makefiles/generated.make
> +++ b/make/windows/makefiles/generated.make
> @@ -91,7 +91,7 @@
>  classes/MakeDeps.class: $(MakeDepsSources)
>        if exist classes rmdir /s /q classes
>        mkdir classes
> -       $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps $(BOOTSTRAP_JAVAC_FLAGS) -d classes $(MakeDepsSources)
> +       $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\MakeDeps -d classes $(MakeDepsSources)
>
>  !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered")
>
> diff --git a/make/windows/makefiles/jvmti.make b/make/windows/makefiles/jvmti.make
> --- a/make/windows/makefiles/jvmti.make
> +++ b/make/windows/makefiles/jvmti.make
> @@ -68,10 +68,10 @@
>         @if not exist $(JvmtiOutDir) mkdir $(JvmtiOutDir)
>
>  $(JvmtiGenClass): $(JvmtiGenSource)
> -       $(COMPILE_JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -d $(JvmtiOutDir) $(JvmtiGenSource)
> +       $(COMPILE_JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
>
>  $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
> -       @$(COMPILE_JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
> +       @$(COMPILE_JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
>
>  $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
>        @echo Generating $@
> diff --git a/make/windows/makefiles/rules.make b/make/windows/makefiles/rules.make
> --- a/make/windows/makefiles/rules.make
> +++ b/make/windows/makefiles/rules.make
> @@ -29,7 +29,7 @@
>  RUN_JAVAP=$(BootStrapDir)\bin\javap
>  RUN_JAVAH=$(BootStrapDir)\bin\javah
>  RUN_JAR=$(BootStrapDir)\bin\jar
> -COMPILE_JAVAC=$(BootStrapDir)\bin\javac
> +COMPILE_JAVAC=$(BootStrapDir)\bin\javac $(BOOTSTRAP_JAVAC_FLAGS)
>  COMPILE_RMIC=$(BootStrapDir)\bin\rmic
>  BOOT_JAVA_HOME=$(BootStrapDir)
>  !else
> @@ -37,7 +37,7 @@
>  RUN_JAVAP=javap
>  RUN_JAVAH=javah
>  RUN_JAR=jar
> -COMPILE_JAVAC=javac
> +COMPILE_JAVAC=javac $(BOOTSTRAP_JAVAC_FLAGS)
>  COMPILE_RMIC=rmic
>  BOOT_JAVA_HOME=
>  !endif
> diff --git a/make/windows/makefiles/sa.make b/make/windows/makefiles/sa.make
> --- a/make/windows/makefiles/sa.make
> +++ b/make/windows/makefiles/sa.make
> @@ -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) $(BOOTSTRAP_JAVAC_FLAGS) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) ....
> -       @$(COMPILE_JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\)
> -       @$(COMPILE_JAVAC) $(BOOTSTRAP_JAVAC_FLAGS) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\)
> +       @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:/=\)
>        $(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
> diff --git a/make/windows/projectfiles/common/Makefile b/make/windows/projectfiles/common/Makefile
> --- a/make/windows/projectfiles/common/Makefile
> +++ b/make/windows/projectfiles/common/Makefile
> @@ -179,6 +179,6 @@
>  $(HOTSPOTBUILDSPACE)/classes/MakeDeps.class: $(MakeDepsSources)
>        @if exist $(HOTSPOTBUILDSPACE)\classes rmdir /s /q $(HOTSPOTBUILDSPACE)\classes
>        @mkdir $(HOTSPOTBUILDSPACE)\classes
> -       @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\MakeDeps $(BOOTSTRAP_JAVAC_FLAGS) -d $(HOTSPOTBUILDSPACE)/classes $(MakeDepsSources)
> +       @$(COMPILE_JAVAC) -classpath $(HOTSPOTWORKSPACE)\src\share\tools\MakeDeps -d $(HOTSPOTBUILDSPACE)/classes $(MakeDepsSources)
>
>  FORCE:
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8

More information about the hotspot-dev mailing list