diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-02 13:01:26 -0400 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-02 13:01:26 -0400 |
| commit | abbf1590de22a6d2240a59383477da50d1402f6a (patch) | |
| tree | e67f6a35d2c26328c878065e7796ccbcd8d90142 /arch/um | |
| parent | a1ce39288e6fbefdd8d607021d02384eb4a20b99 (diff) | |
UAPI: Partition the header include path sets and add uapi/ header directories
Partition the header include path flags into two sets, one for kernelspace
builds and one for userspace builds.
Add the following directories to build after the ordinary include directories
so that #include will pick up the UAPI header directly if the kernel header
has been moved there.
The userspace set (represented by the USERINCLUDE make variable) contains:
-I $(srctree)/arch/$(hdr-arch)/include/uapi
-I arch/$(hdr-arch)/include/generated/uapi
-I $(srctree)/include/uapi
-I include/generated/uapi
-include $(srctree)/include/linux/kconfig.h
and the kernelspace set (represented by the LINUXINCLUDE make variable)
contains:
-I $(srctree)/arch/$(hdr-arch)/include
-I arch/$(hdr-arch)/include/generated
-I $(srctree)/include
-I include --- if not building in the source tree
plus everything in the USERINCLUDE set.
Then use USERINCLUDE in building the x86 boot code.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 097091059aaa..133f7de2a13d 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
| @@ -66,7 +66,9 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\ | |||
| 66 | include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS) | 66 | include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS) |
| 67 | 67 | ||
| 68 | KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \ | 68 | KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \ |
| 69 | -I$(HOST_DIR)/include/generated | 69 | -I$(srctree)/$(HOST_DIR)/include/uapi \ |
| 70 | -I$(HOST_DIR)/include/generated \ | ||
| 71 | -I$(HOST_DIR)/include/generated/uapi | ||
| 70 | 72 | ||
| 71 | # -Derrno=kernel_errno - This turns all kernel references to errno into | 73 | # -Derrno=kernel_errno - This turns all kernel references to errno into |
| 72 | # kernel_errno to separate them from the libc errno. This allows -fno-common | 74 | # kernel_errno to separate them from the libc errno. This allows -fno-common |