LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sandbox: Use system headers first for sandbox's os.c 

This file must be compiled with system headers, even if U-Boot has headers
of the same name. The existing solution for this is good enough for libfdt,
but fails when we have headers like stdint.h in U-Boot.

Use -idirafter instead of -I, and remove the -nostdinc and other things
that we don't want for this file. The best way to do this is to keep a
copy of the original flags, rather than trying to filter them later.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2013-11-10 10:26:48 -07:00
parent 2a54d1599f
commit cbe5cdfcd3
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/sandbox/cpu/Makefile
View File

@ -10,5 +10,7 @@
obj-y := cpu.o os.o start.o state.o obj-y := cpu.o os.o start.o state.o
# os.c is build in the system environment, so needs standard includes # os.c is build in the system environment, so needs standard includes
$(obj)os.o: ALL_CFLAGS := $(filter-out -nostdinc,$(ALL_CFLAGS)) $(obj)os.o: ALL_CFLAGS := $(BASE_CPPFLAGS) \
$(obj).depend.os: CPPFLAGS := $(filter-out -nostdinc,$(CPPFLAGS)) $(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS))
$(obj).depend.os: CPPFLAGS := $(BASE_CPPFLAGS) \
$(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS))

9
config.mk
View File

@ -250,11 +250,16 @@ Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file)
endif endif
endif endif
# Sandbox needs the base flags and includes, so keep them around
BASE_CPPFLAGS := $(CPPFLAGS)
ifneq ($(OBJTREE),$(SRCTREE)) ifneq ($(OBJTREE),$(SRCTREE))
CPPFLAGS += -I$(OBJTREE)/include BASE_INCLUDE_DIRS := $(OBJTREE)/include
endif endif
CPPFLAGS += -I$(TOPDIR)/include -I$(SRCTREE)/arch/$(ARCH)/include BASE_INCLUDE_DIRS += $(TOPDIR)/include $(SRCTREE)/arch/$(ARCH)/include
CPPFLAGS += $(patsubst %, -I%, $(BASE_INCLUDE_DIRS))
CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \ CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \
-isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS) -isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)