On Thu, 2019-03-28 at 03:56 +0000, Andrew John Hughes wrote: > On 26/03/2019 21:57, Langer, Christoph wrote: > > Hi Andrew, > > > > thanks for doing this backport. I agree, Severin's finding needs to be > > added to hotspot's Unix/Posix vm.make files. > > Yes, it was missed because it's already there prior to this patch in the > 9 and up HotSpot build which is quite different. It also seems to > require a change to vm_version.cpp so the value isn't double-quoted.
Nice catch! This is JDK-8200115, right? Perhaps we should keep "XSTR(VENDOR)" in this backport and then also backport JDK-8200115 separately? > > Also, the additional printing of those variables in the Unixish > > buildtree.make files should be added to windows' make/windows/build.make in > > target $(variantDir)\local.make. > > Ah, I was looking for the equivalent but it's odd that it's not in > make/windows, and so didn't show up with grep. > > Revised HotSpot webrev: > > https://cr.openjdk.java.net/~andrew/openjdk8/8189761/hotspot.02 +++ new/src/share/vm/runtime/vm_version.cpp 2019-03-28 03:52:51.384737947 +0000 @@ -140,7 +140,7 @@ const char* Abstract_VM_Version::vm_vendor() { #ifdef VENDOR - return XSTR(VENDOR); + return VENDOR; This looks like the change from JDK-8200115. Have you considered backporting this separately? Failing that, we should mention JDK- 8200115 in the backport commit message as well. Looks good to me otherwise. Thanks, Severin
