[commit] r1358 - in trunk/openbios-devel: . include/arch/ppc

[repository service]

Author: mcayland
Date: Fri Nov  6 16:06:36 2015
New Revision: 1358
URL: http://tracker.coreboot.org/trac/openbios/changeset/1358

Log:
bootstrap: don't include files from target/include as system includes

Replace "-I" by "-iquote" to only take files from this directory
when '#include "..."' is used ('#include <...>' works as usual).

We need this because on powerpc64 asm/sigcontext.h includes <asm/elf.h> and
tries to include target/include/asm/elf.h instead of /usr/include/asm/elf.h.

We also remove from include/arch/ppc/types/h some useless and conflicting
type definitions.

Signed-off-by: Laurent Vivier 
Signed-off-by: Mark Cave-Ayland

Modified:
   trunk/openbios-devel/Makefile.target
   trunk/openbios-devel/include/arch/ppc/types.h

Modified: trunk/openbios-devel/Makefile.target
==============================================================================
--- trunk/openbios-devel/Makefile.target	Fri Nov  6 16:06:33 2015	(r1357)
+++ trunk/openbios-devel/Makefile.target	Fri Nov  6 16:06:36 2015	(r1358)
@@ -15,7 +15,7 @@
 HOSTCFLAGS+= -W
 # Flags for dependency generation
 HOSTCFLAGS+= -MMD -MP -MT $@ -MF '$(*D)/$(*F).d'
-HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include
+HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -iquote $(ODIR)/target/include

CC     := $(TARGET)gcc
 AS     := $(TARGET)as

Modified: trunk/openbios-devel/include/arch/ppc/types.h
==============================================================================
--- trunk/openbios-devel/include/arch/ppc/types.h	Fri Nov  6 16:06:33 2015	(r1357)
+++ trunk/openbios-devel/include/arch/ppc/types.h	Fri Nov  6 16:06:36 2015	(r1358)
@@ -84,21 +84,13 @@
 /* size named types */

typedef unsigned char   u8;
-typedef unsigned char   __u8;
 typedef unsigned short u16;
-typedef unsigned short __u16;
 typedef unsigned int   u32;
-typedef unsigned int   __u32;
 typedef unsigned long long u64;
-typedef unsigned long long __u64;

typedef signed char	s8;
-typedef signed char	__s8;
 typedef short		s16;
-typedef short		__s16;
 typedef int		s32;
-typedef int		__s32;
 typedef long long	s64;
-typedef long long	__s64;

#endif