summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-12-11 00:52:12 +0000
committerMike Frysinger <vapier@gentoo.org>2006-12-11 00:52:12 +0000
commit257678943161eba72051cbbe6c3cbefd63924cd8 (patch)
tree44f90e850e302f3fa5e17f7fcdf17c986b4350b9
parent08c9e9e978882a46433e8b07699e3a9d6254e821 (diff)
kill off the need for fix_includes.sh by utilizing KERNEL_SOURCE directly
-rw-r--r--Makefile.in6
-rw-r--r--Rules.mak7
-rwxr-xr-xextra/scripts/fix_includes.sh157
-rwxr-xr-xextra/scripts/gen_bits_syscall_h.sh8
4 files changed, 6 insertions, 172 deletions
diff --git a/Makefile.in b/Makefile.in
index f6d3d24f1..020cd32fc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,10 +56,6 @@ HEADERS_BITS_COMMON := $(filter-out $(HEADERS_BITS_ARCH),$(HEADERS_BITS_COMMON))
headers: include/bits/uClibc_config.h
$(Q)$(MAKE) headers-y
$(Q)\
- $(SHELL) $(top_srcdir)extra/scripts/fix_includes.sh \
- -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) \
- $(header_extra_args)
- $(Q)\
set -e; \
if [ -f libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h ] ; then \
$(LN) -fs ../libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h include/ ; \
@@ -94,7 +90,7 @@ headers: include/bits/uClibc_config.h
cd $(top_builddir); \
tmp=`mktemp include/bits/sysnum.h.XXXXXX 2>/dev/null`; \
[ -z "$$tmp" ] && tmp='include/bits/sysnum.h.new'; \
- top_builddir=. CC="$(CC) $(CPU_CFLAGS)" $(SHELL) extra/scripts/gen_bits_syscall_h.sh > $$tmp; \
+ KERNEL_SOURCE="${KERNEL_SOURCE}" top_builddir=. CC="$(CC) $(CPU_CFLAGS)" $(SHELL) extra/scripts/gen_bits_syscall_h.sh > $$tmp; \
if cmp include/bits/sysnum.h $$tmp >/dev/null 2>&1; then \
$(RM) $$tmp; \
else \
diff --git a/Rules.mak b/Rules.mak
index 5f404489a..6822f8ce8 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -471,6 +471,7 @@ else
PTNAME :=
PTINC :=
endif
+CFLAGS += -I$(KERNEL_SOURCE)
# Sigh, some stupid versions of gcc can't seem to cope with '-iwithprefix include'
#CFLAGS+=-iwithprefix include
@@ -480,12 +481,6 @@ ifneq ($(DOASSERTS),y)
CFLAGS+=-DNDEBUG
endif
-# moved from ldso/{ldso,libdl}
-# BEWARE!!! At least mips* will die if -O0 is used!!!
-ifeq ($(TARGET_ARCH),mips)
-CFLAGS:=$(CFLAGS:-O0=-O1)
-endif
-
# Keep the check_as from being needlessly executed
ifndef ASFLAGS_NOEXEC
ifeq ($(UCLIBC_BUILD_NOEXECSTACK),y)
diff --git a/extra/scripts/fix_includes.sh b/extra/scripts/fix_includes.sh
deleted file mode 100755
index 106522c35..000000000
--- a/extra/scripts/fix_includes.sh
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
-#
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-#
-
-usage() {
- echo ""
- echo "usage: "`basename $0`" -k KERNEL_SOURCE_DIRECTORY -t TARGET_ARCH"
- echo ""
- echo "This utility scans the KERNEL_SOURCE_DIRECTORY directory and"
- echo "checks that it contains well formed kernel headers suitable"
- echo "for inclusion as the include/linux/ directory provided by"
- echo "uClibc."
- echo ""
- echo "If the specified kernel headers are present and already"
- echo "configured for the architecture specified by TARGET_ARCH,"
- echo "they will be used as-is."
- echo ""
- echo "If the specified kernel headers are missing entirely, this"
- echo "script will return an error."
- echo ""
- echo "If the specified kernel headers are present, but are either"
- echo "not yet configured or are configured for an architecture"
- echo "different than that specified by TARGET_ARCH, this script"
- echo "will attempt to 'fix' the kernel headers and make them"
- echo "suitable for use by uClibc. This fixing process may fail."
- echo "It is therefore best to always provide kernel headers that"
- echo "are already configured for the selected architecture."
- echo ""
- echo "Most Linux distributions provide 'kernel-headers' packages"
- echo "that are suitable for use by uClibc."
- echo ""
- echo ""
- exit 1
-}
-
-
-#
-# Parse our arguments
-#
-HAS_MMU="y"
-KERNEL_SOURCE=""
-TARGET_ARCH=""
-while [ -n "$1" ]; do
- case $1 in
- -k ) shift; if [ -n "$1" ]; then KERNEL_SOURCE=$1; shift; else usage; fi; ;;
- -t ) shift; if [ -n "$1" ]; then TARGET_ARCH=$1; shift; else usage; fi; ;;
- -n ) shift; HAS_MMU="n"; ;;
- -* ) usage; ;;
- * ) usage; ;;
- esac
-done
-
-
-#
-# Perform some sanity checks on our kernel sources
-#
-if [ ! -f "$KERNEL_SOURCE/Makefile" -a ! -f "$KERNEL_SOURCE/include/linux/version.h" ]; then
- echo ""
- echo ""
- echo "The file $KERNEL_SOURCE/Makefile or $KERNEL_SOURCE/include/linux/version.h is missing!"
- echo "Perhaps your kernel source is broken?"
- echo ""
- echo ""
- exit 1
-fi
-if [ ! -d "$KERNEL_SOURCE" ]; then
- echo ""
- echo ""
- echo "$KERNEL_SOURCE is not a directory"
- echo ""
- echo ""
- exit 1
-fi
-
-
-#
-# Create a symlink to include/asm
-#
-rm -f include/asm*
-if [ ! -d "$KERNEL_SOURCE/include/asm" ]; then
- echo ""
- echo ""
- echo "The symlink $KERNEL_SOURCE/include/asm is missing\!"
- echo "Perhaps you forgot to configure your kernel source?"
- echo "You really should configure your kernel source tree so I"
- echo "do not have to try and guess about this sort of thing."
- echo ""
- echo "Attempting to guess a usable value...."
- echo ""
- echo ""
- sleep 1
-
- if [ "$TARGET_ARCH" = "powerpc" ]; then
- set -x
- ln -fs $KERNEL_SOURCE/include/asm-ppc include/asm
- set +x
- elif [ "$TARGET_ARCH" = "mips" ]; then
- set -x
- ln -fs $KERNEL_SOURCE/include/asm-mips include/asm
- set +x
- elif [ "$TARGET_ARCH" = "arm" ]; then
- set -x
- ln -fs $KERNEL_SOURCE/include/asm-arm include/asm
- set +x
- if [ ! -L $KERNEL_SOURCE/include/asm-arm/proc ]; then
- if [ ! -L proc ]; then
- (
- cd include/asm
- ln -fs proc-armv proc
- ln -fs arch-ebsa285 arch
- )
- fi
- fi
- elif [ "$TARGET_ARCH" = "cris" ]; then
- set -x
- ln -fs $KERNEL_SOURCE/include/asm-cris include/asm
- set +x
- elif [ "$HAS_MMU" != "y" ]; then
- if [ -d $KERNEL_SOURCE/include/asm-${TARGET_ARCH}nommu ]; then
- set -x
- ln -fs $KERNEL_SOURCE/include/asm-${TARGET_ARCH}nommu include/asm
- set +x
- else
- set -x
- ln -fs $KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm
- set +x
- fi
- else
- set -x
- ln -fs $KERNEL_SOURCE/include/asm-$TARGET_ARCH include/asm
- set +x
- fi;
-else
- # No guessing required.....
- for x in $KERNEL_SOURCE/include/asm* ; do
- ln -fs ${x} include/
- done
-fi
-
-
-#
-# Annoyingly, 2.6.x kernel headers also need an include/asm-generic/ directory
-#
-if [ -e $KERNEL_SOURCE/include/asm-generic ]; then
- rm -f include/asm-generic
- ln -fs $KERNEL_SOURCE/include/asm-generic include/asm-generic
-fi
-
-
-#
-# Create the include/linux symlink.
-#
-rm -f include/linux
-ln -fs $KERNEL_SOURCE/include/linux include/linux
diff --git a/extra/scripts/gen_bits_syscall_h.sh b/extra/scripts/gen_bits_syscall_h.sh
index 6a791be34..0ba444007 100755
--- a/extra/scripts/gen_bits_syscall_h.sh
+++ b/extra/scripts/gen_bits_syscall_h.sh
@@ -14,16 +14,16 @@
#
# Warning!!! This does _no_ error checking!!!
-UNISTD_H_PATH=$top_builddir/include/asm/unistd.h
-INCLUDE_OPTS="-I$top_builddir/include"
+INCLUDE_OPTS="-nostdinc -I${KERNEL_SOURCE}"
case $CC in
*icc*) CC_SYSNUM_ARGS="-dM" ;;
*) CC_SYSNUM_ARGS="-dN" ;;
esac
-( echo "#include \"$UNISTD_H_PATH\"" ;
- $CC -E $CC_SYSNUM_ARGS $INCLUDE_OPTS $UNISTD_H_PATH |
+( echo "#include <asm/unistd.h>";
+ echo "#include <asm/unistd.h>" |
+ $CC -E $CC_SYSNUM_ARGS $INCLUDE_OPTS - |
sed -ne 's/^[ ]*#define[ ]*__NR_\([A-Za-z0-9_]*\).*/UCLIBC_\1 __NR_\1/gp' \
-e 's/^[ ]*#undef[ ]*__NR_\([A-Za-z0-9_]*\).*/UNDEFUCLIBC_\1 __NR_\1/gp' # needed to strip out any kernel-internal defines
) |