From 828ba271af0e7a61154740646014c5b1d81d8fb9 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Thu, 7 Jan 2010 11:55:08 +0100 Subject: nptl: sysdep headers re-factoring This patch will re-factor and simplify sysdep headers handling for nptl branch. The reason is to use some useful macros in asm code (i.e. ENTRY()) that are available only into nptl branch because are defined in sysdep.h header under the nptl folder even if they are not related to NPTL at all (this was likely due to a bad choice done at the early stage of NPTL porting). This is a required steps for integrating into master branch some asm code available in nptl branch for sh4. The main changes are described below: nptl/sysdeps/generic/sysdep.h (moved) ---> libc/sysdeps/linux/common/sysdep.h nptl/sysdeps/arm/sysdep.h (moved) ---> libc/sysdeps/linux/arm/sysdep.h nptl/sysdeps/sh/sysdep.h ---------------------| nptl/sysdeps/unix/sh/sysdep.h ----------------| nptl/sysdeps/unix/sysv/linux/sh/sysdep.h -----| nptl/sysdeps/unix/sysv/linux/sh/sh4/sysdep.h -| |(merged) ---> libc/sysdeps/linux/sh nptl/sysdeps/unix/sysdep.h (deleted) Similarly the mips and arm sysdep.h should be merged and updated as for sh arch. Signed-off-by: Carmelo Amoroso --- Rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Rules.mak') diff --git a/Rules.mak b/Rules.mak index afecb7751..aaa8cb058 100644 --- a/Rules.mak +++ b/Rules.mak @@ -548,6 +548,7 @@ NOSTDLIB_CFLAGS:=$(call check_gcc,-nostdlib,) CFLAGS := -include $(top_srcdir)include/libc-symbols.h \ $(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \ -nostdinc -I$(top_builddir)include -I$(top_srcdir)include -I. \ + -I$(top_srcdir)libc/sysdeps/linux \ -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"") CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS)) @@ -637,7 +638,6 @@ PTINC:= -I$(top_srcdir)$(PTDIR) \ -I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux \ -I$(top_srcdir)$(PTDIR)/sysdeps/pthread \ -I$(top_srcdir)$(PTDIR)/sysdeps/pthread/bits \ - -I$(top_srcdir)$(PTDIR)/sysdeps/generic \ -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \ -I$(top_srcdir)ldso/include # -- cgit v1.2.3