lkml.org 
[lkml]   [2010]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectGeneric support for asm-generic headers [Was: a new UniCore32 arch-dependent patch for linux-2.6.37-rc1]
    > 
    > > > +#####
    > > > +# Auto Generate the files that only include the corresponding
    > asm-generic
    > > file
    > > > +# 6 files in 27-uc: errno.h fcntl.h ioctl.h poll.h resource.h
    > siginfo.h
    > > > +
    > > > +define cmd_asmgeneric
    > > > + (set -e; \
    > > > + echo '#include <asm-generic/$(notdir $@)>' ) > $@
    > > > +endef
    > >
    > > Nice trick. I'd love to have something like this in the common code so
    > > we can do the same for all architectures.

    Just a quick proof-of-concept hack.

    Sam

    diff --git a/Makefile b/Makefile
    index ab5359d..e878120 100644
    --- a/Makefile
    +++ b/Makefile
    @@ -344,7 +344,9 @@ CFLAGS_GCOV = -fprofile-arcs -ftest-coverage

    # Use LINUXINCLUDE when you must reference the include/ directory.
    # Needed to be compatible with the O= option
    -LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \
    +LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include \
    + $(if $(KBUILD_SRC), -Iarch/$(hdr-arch)/include) \
    + -Iinclude \
    $(if $(KBUILD_SRC), -I$(srctree)/include) \
    -include include/generated/autoconf.h

    @@ -950,7 +952,13 @@ prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \

    archprepare: prepare1 scripts_basic

    -prepare0: archprepare FORCE
    +archheaders: $(addprefix arch/$(SRCARCH)/include/asm/, $(ARCH_GENERIC_HEADERS))
    +
    +$(addprefix arch/$(SRCARCH)/include/asm/, $(ARCH_GENERIC_HEADERS)): arch/$(SRCARCH)/Makefile
    + $(Q)mkdir -p $(dir $@)
    + $(Q)echo '#include <asm-generic/$(notdir $@)>' > $@
    +
    +prepare0: archprepare archheaders FORCE
    $(Q)$(MAKE) $(build)=.
    $(Q)$(MAKE) $(build)=. missing-syscalls

    diff --git a/arch/x86/Makefile b/arch/x86/Makefile
    index b02e509..fd23d01 100644
    --- a/arch/x86/Makefile
    +++ b/arch/x86/Makefile
    @@ -12,6 +12,8 @@ endif
    # e.g.: obj-y += foo_$(BITS).o
    export BITS

    +ARCH_GENERIC_HEADERS := termios.h
    +
    ifeq ($(CONFIG_X86_32),y)
    BITS := 32
    UTS_MACHINE := i386
    diff --git a/arch/x86/include/asm/termios.h b/arch/x86/include/asm/termios.h
    deleted file mode 100644
    index 280d78a..0000000
    --- a/arch/x86/include/asm/termios.h
    +++ /dev/null
    @@ -1 +0,0 @@
    -#include <asm-generic/termios.h>

    \
     
     \ /
      Last update: 2010-11-20 14:21    [W:0.022 / U:0.220 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site