RFR: JDK-8087195: Support building hotspot with devkits on Macosx (original) (raw)

Erik Joelsson erik.joelsson at oracle.com
Fri Jun 12 06:35:25 UTC 2015

Hello David,

On 2015-06-12 04:20, David Holmes wrote:

Hi Erik,

On 11/06/2015 11:11 PM, Erik Joelsson wrote: Hello again,

I missed cleaning the path correctly when testing this so missed another needed change. When calling "lipo", the hotspot makefiles should use the variable supplied by configure. Here is an updated patch. Webrev: http://cr.openjdk.java.net/~erikj/8087195/webrev.hotspot.01/ Typo: + # we run it explicitly before runing dtrace. runing -> running Fixing that. Looks okay, only question I have is whether the preprocessed .d files should be placed into DtraceOutDir or some tmp location? I'm not sure where the contents of DtraceOutDir end up. It's defined as DtraceOutDir = $(GENERATED)/dtracefiles

which I assume is added to -I for the compiler later. I would say that it's safe to have a couple of other files end up in the same directory.

Thanks /Erik

Thanks, David

/Erik

On 2015-06-11 12:53, Erik Joelsson wrote: Hello,

Please review this small makefile tweak. When using a devkit to build hotspot on Macosx, the dtrace command gets confused and tries to use the wrong preprocessor. I've fixed this by splitting out the running of the preprocessor to a separate call. I've verified by comparing the generated header files with and without the patch. Bug: https://bugs.openjdk.java.net/browse/JDK-8087195 Patch inline: diff -r 11af3990d56c make/bsd/makefiles/dtrace.make --- a/make/bsd/makefiles/dtrace.make +++ b/make/bsd/makefiles/dtrace.make @@ -263,14 +263,19 @@ $(DtraceOutDir): mkdir $(DtraceOutDir) +# When building using a devkit, dtrace cannot find the correct preprocessor so +# we run it explicitly before runing dtrace. $(DtraceOutDir)/hotspot.h: $(DTRACECOMMONSRCDIR)/hotspot.d | $(DtraceOutDir) - (QUIETLY)(QUIETLY) (QUIETLY)(DTRACEPROG) (DTRACEOPTS)−C−I.−h−o(DTRACEOPTS) -C -I. -h -o (DTRACEOPTS)−C−I.−h−o@ -s $(DTRACECOMMONSRCDIR)/hotspot.d + (QUIETLY)(QUIETLY) (QUIETLY)(CC) -E $(DTRACEOPTS) -I. -x c $(DTRACECOMMONSRCDIR)/hotspot.d > $(DtraceOutDir)/hotspot.d + (QUIETLY)(QUIETLY) (QUIETLY)(DTRACEPROG) -h -o @−s@ -s @−s(DtraceOutDir)/hotspot.d $(DtraceOutDir)/hotspotjni.h: $(DTRACECOMMONSRCDIR)/hotspotjni.d | $(DtraceOutDir) - (QUIETLY)(QUIETLY) (QUIETLY)(DTRACEPROG) (DTRACEOPTS)−C−I.−h−o(DTRACEOPTS) -C -I. -h -o (DTRACEOPTS)−C−I.−h−o@ -s $(DTRACECOMMONSRCDIR)/hotspotjni.d + (QUIETLY)(QUIETLY) (QUIETLY)(CC) -E $(DTRACEOPTS) -I. -x c $(DTRACECOMMONSRCDIR)/hotspotjni.d > $(DtraceOutDir)/hotspotjni.d + (QUIETLY)(QUIETLY) (QUIETLY)(DTRACEPROG) -h -o $@ -s $(DtraceOutDir)/hotspotjni.d $(DtraceOutDir)/hsprivate.h: $(DTRACECOMMONSRCDIR)/hsprivate.d | $(DtraceOutDir) - (QUIETLY)(QUIETLY) (QUIETLY)(DTRACEPROG) (DTRACEOPTS)−C−I.−h−o(DTRACEOPTS) -C -I. -h -o (DTRACEOPTS)−C−I.−h−o@ -s $(DTRACECOMMONSRCDIR)/hsprivate.d + (QUIETLY)(QUIETLY) (QUIETLY)(CC) -E $(DTRACEOPTS) -I. -x c $(DTRACECOMMONSRCDIR)/hsprivate.d > $(DtraceOutDir)/hsprivate.d + (QUIETLY)(QUIETLY) (QUIETLY)(DTRACEPROG) -h -o @−s@ -s @−s(DtraceOutDir)/hsprivate.d dtracegenheaders: $(DtraceOutDir)/hotspot.h $(DtraceOutDir)/hotspotjni.h $(DtraceOutDir)/hsprivate.h

/Erik

More information about the hotspot-dev mailing list