* [U-Boot] [PATCH] sandbox: Use system headers first for sandbox's os.c in a different way
@ 2013-11-26 7:13 Masahiro Yamada
2014-01-27 16:24 ` Simon Glass
2014-01-29 22:34 ` [U-Boot] " Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Masahiro Yamada @ 2013-11-26 7:13 UTC (permalink / raw)
To: u-boot
Commit cbe5cdfcd changed config.mk and arch/sandbox/cpu/Makefile
to use -idirafter instead of -I and remove -nostdinc.
But
* Sandbox-specific code dirties config.mk
* os.c is compiled without such compiler flags as:
-Wall -Wstrict-prototypes -Wno-format-security
-fno-builtin -ffreestanding -fno-stack-protector
-fstack-usage -Wno-format-nonliteral
This commit use -idirafter and remove the -nostdinc
differently and more simply.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
---
Hello Simon
Could you check if this patch works for you?
arch/sandbox/cpu/Makefile | 8 ++++----
config.mk | 9 ++-------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/arch/sandbox/cpu/Makefile b/arch/sandbox/cpu/Makefile
index 58c2537..b564294 100644
--- a/arch/sandbox/cpu/Makefile
+++ b/arch/sandbox/cpu/Makefile
@@ -10,7 +10,7 @@
obj-y := cpu.o os.o start.o state.o
# os.c is build in the system environment, so needs standard includes
-$(obj)os.o: ALL_CFLAGS := $(BASE_CPPFLAGS) \
- $(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS))
-$(obj).depend.os: CPPFLAGS := $(BASE_CPPFLAGS) \
- $(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS))
+$(obj)os.o: CFLAGS := $(filter-out -nostdinc,\
+ $(patsubst -I%,-idirafter%,$(CFLAGS)))
+$(obj).depend.os: CPPFLAGS := $(filter-out -nostdinc,\
+ $(patsubst -I%,-idirafter%,$(CPPFLAGS)))
diff --git a/config.mk b/config.mk
index d5b09a0..206de20 100644
--- a/config.mk
+++ b/config.mk
@@ -250,16 +250,11 @@ Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file)
endif
endif
-# Sandbox needs the base flags and includes, so keep them around
-BASE_CPPFLAGS := $(CPPFLAGS)
-
ifneq ($(OBJTREE),$(SRCTREE))
-BASE_INCLUDE_DIRS := $(OBJTREE)/include
+CPPFLAGS += -I$(OBJTREE)/include
endif
-BASE_INCLUDE_DIRS += $(TOPDIR)/include $(SRCTREE)/arch/$(ARCH)/include
-
-CPPFLAGS += $(patsubst %, -I%, $(BASE_INCLUDE_DIRS))
+CPPFLAGS += -I$(TOPDIR)/include -I$(SRCTREE)/arch/$(ARCH)/include
CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \
-isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [U-Boot] [PATCH] sandbox: Use system headers first for sandbox's os.c in a different way
2013-11-26 7:13 [U-Boot] [PATCH] sandbox: Use system headers first for sandbox's os.c in a different way Masahiro Yamada
@ 2014-01-27 16:24 ` Simon Glass
2014-01-29 22:34 ` [U-Boot] " Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Simon Glass @ 2014-01-27 16:24 UTC (permalink / raw)
To: u-boot
On 26 November 2013 00:13, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote:
> Commit cbe5cdfcd changed config.mk and arch/sandbox/cpu/Makefile
> to use -idirafter instead of -I and remove -nostdinc.
>
> But
> * Sandbox-specific code dirties config.mk
> * os.c is compiled without such compiler flags as:
> -Wall -Wstrict-prototypes -Wno-format-security
> -fno-builtin -ffreestanding -fno-stack-protector
> -fstack-usage -Wno-format-nonliteral
>
> This commit use -idirafter and remove the -nostdinc
> differently and more simply.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
> ---
>
> Hello Simon
>
> Could you check if this patch works for you?
>
> arch/sandbox/cpu/Makefile | 8 ++++----
> config.mk | 9 ++-------
> 2 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/arch/sandbox/cpu/Makefile b/arch/sandbox/cpu/Makefile
> index 58c2537..b564294 100644
> --- a/arch/sandbox/cpu/Makefile
> +++ b/arch/sandbox/cpu/Makefile
> @@ -10,7 +10,7 @@
> obj-y := cpu.o os.o start.o state.o
>
> # os.c is build in the system environment, so needs standard includes
> -$(obj)os.o: ALL_CFLAGS := $(BASE_CPPFLAGS) \
> - $(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS))
> -$(obj).depend.os: CPPFLAGS := $(BASE_CPPFLAGS) \
> - $(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS))
> +$(obj)os.o: CFLAGS := $(filter-out -nostdinc,\
> + $(patsubst -I%,-idirafter%,$(CFLAGS)))
> +$(obj).depend.os: CPPFLAGS := $(filter-out -nostdinc,\
> + $(patsubst -I%,-idirafter%,$(CPPFLAGS)))
> diff --git a/config.mk b/config.mk
> index d5b09a0..206de20 100644
> --- a/config.mk
> +++ b/config.mk
> @@ -250,16 +250,11 @@ Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file)
> endif
> endif
>
> -# Sandbox needs the base flags and includes, so keep them around
> -BASE_CPPFLAGS := $(CPPFLAGS)
> -
> ifneq ($(OBJTREE),$(SRCTREE))
> -BASE_INCLUDE_DIRS := $(OBJTREE)/include
> +CPPFLAGS += -I$(OBJTREE)/include
> endif
>
> -BASE_INCLUDE_DIRS += $(TOPDIR)/include $(SRCTREE)/arch/$(ARCH)/include
> -
> -CPPFLAGS += $(patsubst %, -I%, $(BASE_INCLUDE_DIRS))
> +CPPFLAGS += -I$(TOPDIR)/include -I$(SRCTREE)/arch/$(ARCH)/include
> CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \
> -isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)
>
> --
> 1.8.3.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] sandbox: Use system headers first for sandbox's os.c in a different way
2013-11-26 7:13 [U-Boot] [PATCH] sandbox: Use system headers first for sandbox's os.c in a different way Masahiro Yamada
2014-01-27 16:24 ` Simon Glass
@ 2014-01-29 22:34 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2014-01-29 22:34 UTC (permalink / raw)
To: u-boot
On Tue, Nov 26, 2013 at 04:13:59PM +0900, Masahiro wrote:
> Commit cbe5cdfcd changed config.mk and arch/sandbox/cpu/Makefile
> to use -idirafter instead of -I and remove -nostdinc.
>
> But
> * Sandbox-specific code dirties config.mk
> * os.c is compiled without such compiler flags as:
> -Wall -Wstrict-prototypes -Wno-format-security
> -fno-builtin -ffreestanding -fno-stack-protector
> -fstack-usage -Wno-format-nonliteral
>
> This commit use -idirafter and remove the -nostdinc
> differently and more simply.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Simon Glass <sjg@chromium.org>
> Acked-by: Simon Glass <sjg@chromium.org>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140129/684a34d9/attachment.pgp>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-29 22:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-26 7:13 [U-Boot] [PATCH] sandbox: Use system headers first for sandbox's os.c in a different way Masahiro Yamada
2014-01-27 16:24 ` Simon Glass
2014-01-29 22:34 ` [U-Boot] " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox