diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2012-10-29 13:34:26 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-11-04 11:00:34 -0700 |
| commit | aa9e891c6331555a75ddcb490fc61160ca7d1657 (patch) | |
| tree | adf54577fc26072a30e5f36b6bacf65fd5a303ec /include/linux/stddef.h | |
| parent | 25b26ec69fb5390ce08601189d8848fcef91b97c (diff) | |
| download | u-boot-imx-aa9e891c6331555a75ddcb490fc61160ca7d1657.zip u-boot-imx-aa9e891c6331555a75ddcb490fc61160ca7d1657.tar.gz u-boot-imx-aa9e891c6331555a75ddcb490fc61160ca7d1657.tar.bz2 | |
include/linux/stddef.h: avoid 'warning: preprocessor token offsetof redefined'
hack to avoid:
/opt/gcc-4.6.3-nolibc/powerpc-linux/bin/../lib/gcc/powerpc-linux/4.6.3/include/stddef.h:413:9: warning: preprocessor token offsetof redefined
u-boot/include/linux/stddef.h:20:9: this was the original definition
tried protecting with __KERNEL__, and #including compiler.h first.
Even tried include dir reordering to no avail:
+++ b/config.mk
@@ -194,7 +194,11 @@ OBJCFLAGS += --gap-fill=0xff
gccincdir := $(shell $(CC) -print-file-name=include)
CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS) \
- -D__KERNEL__
+ -D__KERNEL__ \
+ -I $(gccincdir) \
+ -nostdinc
+
+# -isystem $(gccincdir) \
# Enable garbage collection of un-used sections for SPL
ifeq ($(CONFIG_SPL_BUILD),y)
@@ -227,8 +231,7 @@ CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include
endif
CPPFLAGS += -I$(TOPDIR)/include
-CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \
- -isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)
+CPPFLAGS += -fno-builtin -ffreestanding -pipe $(PLATFORM_CPPFLAGS)
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'include/linux/stddef.h')
| -rw-r--r-- | include/linux/stddef.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/stddef.h b/include/linux/stddef.h index 81e34c2..c540f61 100644 --- a/include/linux/stddef.h +++ b/include/linux/stddef.h @@ -12,7 +12,9 @@ #include <linux/types.h> #endif +#ifndef __CHECKER__ #undef offsetof #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) +#endif #endif |