RFR: JDK-8190484 Move jvm.h, jmm.h et al to hotspot/*/include
Erik Joelsson
erik.joelsson at oracle.com
Mon Dec 4 17:33:13 UTC 2017
Hello Magnus,
The <module>-copy targets are currently only being generated for modules
that have make/copy/Copy-<module>.gmk makefiles present. By removing
make/copy/Copy-jdk.accessibility.gmk and
make/copy/Copy-jdk.jdwp.agent.gmk, those targets are no longer created
so the logic in CopyCommon will not be executed.
This can be solved in two ways. Either generate <module>-copy rules for
all modules or leave the files there with just include CopyCommon.gmk as
the only contents. I would recommend the latter for now. Most modules do
not need to copy anything.
Another minor note, when ordering include directories, I usually put the
most specific dir first, so that any platform specific header file with
the same name would override a more general one. We don't have that
situation in this case, but I still think it's good practice.
Regarding where to push this. IMO, if it depends on a change currently
in hs, push it to hs. If it ends up in JDK 10 or 11 doesn't really
matter that much.
/Erik
On 2017-12-04 03:06, Magnus Ihse Bursie wrote:
> JDK-8190484 was created as a follow-up bug to the unification of the
> duplicated jvm.h, jvm_md.h and jmm.h, to determine the proper location
> of these files. This has now been decided to be hotspot/share/include
> and hotspot/os/$OS/include, respectively.
>
> This patch moves the relevant files there, but since this also frees
> up the src/$MODULE/native/include directories for the original
> purpose, it also unifies and simplifies the build logic for these
> directories, so that common code is executed for all modules to just
> copy any exported header files from these directories, should they exist.
>
> I'm intending to push this to jdk-hs.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8190484
> WebRev:
> http://cr.openjdk.java.net/~ihse/JDK-8190484-move-hotspot-exported-includes/webrev.01
>
> /Magnus
More information about the hotspot-dev
mailing list