From 923ecf7916a72c141237e4f96ebf37cfec161260 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 2 Jul 2011 06:49:56 +0000 Subject: [PATCH] add a portable version of sys/sysmacros.h and and let the kernel use the host include dir, fixes x86 builds on non-gnu systems git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27346 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-defaults.mk | 2 ++ tools/Makefile | 3 +- tools/include/sys/sysmacros.h | 56 +++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 tools/include/sys/sysmacros.h diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 1bc829b90..5fd27ae7c 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -22,6 +22,8 @@ ifneq (,$(KERNEL_CC)) KERNEL_MAKEOPTS += CC="$(KERNEL_CC)" endif +export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include + # defined in quilt.mk Kernel/Patch:=$(Kernel/Patch/Default) ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") diff --git a/tools/Makefile b/tools/Makefile index 80c2d1162..486734bc8 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -80,8 +80,9 @@ $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build $(call PrepareStaging,$(STAGING_DIR_HOST)) - mkdir -p $(BUILD_DIR_HOST)/stamp + mkdir -p $(BUILD_DIR_HOST)/stamp $(STAGING_DIR_HOST)/include/sys $(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/ + $(INSTALL_DATA) $(TOPDIR)/tools/include/sys/*.h $(STAGING_DIR_HOST)/include/sys/ touch $@ diff --git a/tools/include/sys/sysmacros.h b/tools/include/sys/sysmacros.h new file mode 100644 index 000000000..997d9286b --- /dev/null +++ b/tools/include/sys/sysmacros.h @@ -0,0 +1,56 @@ +/* Definitions of macros to access `dev_t' values. + Copyright (C) 1996, 1997, 1999, 2003, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef __SYS_SYSMACROS_H +#define __SYS_SYSMACROS_H 1 + +static inline unsigned int +__gnu_dev_major(unsigned long long int __dev) +{ + return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff); +} + +static inline unsigned int +__gnu_dev_minor(unsigned long long int __dev) +{ + return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff); +} + +static inline unsigned long long int +__gnu_dev_makedev(unsigned int __major, unsigned int __minor) +{ + return ((__minor & 0xff) | ((__major & 0xfff) << 8) + | (((unsigned long long int) (__minor & ~0xff)) << 12) + | (((unsigned long long int) (__major & ~0xfff)) << 32)); +} + +/* Access the functions with their traditional names. */ +#ifndef major +# define major(dev) __gnu_dev_major (dev) +#endif + +#ifndef minor +# define minor(dev) __gnu_dev_minor (dev) +#endif + +#ifndef makedev +# define makedev(maj, min) __gnu_dev_makedev (maj, min) +#endif + +#endif /* sys/sysmacros.h */ -- 2.20.1