Re: [Xen-devel] [PATCH] tools: remove local links to the x86 headers

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 12.07.18 at 17:20, <roger.pau@xxxxxxxxxx> wrote:
> On Thu, Jul 12, 2018 at 06:01:43AM -0600, Jan Beulich wrote:
>> >>> On 12.07.18 at 12:40, <roger.pau@xxxxxxxxxx> wrote:
>> > --- a/tools/include/Makefile
>> > +++ b/tools/include/Makefile
>> > @@ -21,6 +21,9 @@ xen/.dir:
>> >    ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) 
> xen/libelf/
>> >    ln -s ../xen-foreign xen/foreign
>> >    ln -sf $(XEN_ROOT)/xen/include/acpi acpi
>> > +ifeq ($(CONFIG_X86),y)
>> > +  ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm
>> > +endif
>> 
>> Don't you need a .gitignore adjustment for this?
> 
> There's already a tools/include/xen/* that covers it.

Ah, good.

>> > --- a/tools/tests/x86_emulator/Makefile
>> > +++ b/tools/tests/x86_emulator/Makefile
>> > @@ -118,7 +118,7 @@ $(TARGET): x86-emulate.o test_x86_emulator.o wrappers.o
>> >  
>> >  .PHONY: clean
>> >  clean:
>> > -  rm -rf $(TARGET) *.o *~ core $(addsuffix .h,$(TESTCASES)) *.bin 
>> > x86_emulate 
>> > asm
>> > +  rm -rf $(TARGET) *.o *~ core $(addsuffix .h,$(TESTCASES)) *.bin 
>> > x86_emulate
>> >  
>> >  .PHONY: distclean
>> >  distclean: clean
>> > @@ -131,17 +131,11 @@ x86_emulate:
>> >  
>> >  x86_emulate/%: x86_emulate ;
>> >  
>> > -asm:
>> > -  [ -L $@ ] || ln -sf $(XEN_ROOT)/xen/include/asm-x86 $@
>> > -
>> > -asm/%: asm ;
>> > -
>> >  HOSTCFLAGS-x86_64 := -fno-PIE
>> >  $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie)
>> >  HOSTCFLAGS += $(CFLAGS_xeninclude) -I. $(HOSTCFLAGS-$(XEN_COMPILE_ARCH))
>> >  
>> > -x86.h := asm/x86-vendors.h asm/x86-defns.h asm/msr-index.h
>> > -x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h)
>> > +x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h
>> 
>> While removing this dependency in the fuzzer case looks to be fine, it
>> clearly isn't here: No .*.d get generated, so a change to any of those
>> files would now no longer trigger a re-build.
> 
> Oh, right. I've changed it to:
> 
> x86.h := $(addprefix $(XEN_ROOT)/tools/include/xen/asm/,\
>                      x86-vendors.h x86-defns.h msr-index.h)
> x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h)
> 
> AFAICT this works fine and detects changes in the files.

Looks okay, thanks.

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel