X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fplatform.h;h=c2013b39dacd2ec223897d705a420ca0c8c648c3;hb=c14d39e83a7f55ab9b92e98673a281fd6565c32d;hp=10c1d7d867b2617b41ee49188e57141f77b5f932;hpb=bba7f08d2788bc9bc30a7a60fdfd873a73fead9a;p=oweals%2Fbusybox.git diff --git a/include/platform.h b/include/platform.h index 10c1d7d86..c2013b39d 100644 --- a/include/platform.h +++ b/include/platform.h @@ -11,7 +11,7 @@ #undef __GNUC_PREREQ #if defined __GNUC__ && defined __GNUC_MINOR__ # define __GNUC_PREREQ(maj, min) \ - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) #else # define __GNUC_PREREQ(maj, min) 0 #endif @@ -34,7 +34,7 @@ #endif #undef inline -#if __STDC_VERSION__ > 199901L +#if defined(__STDC_VERSION__) && __STDC_VERSION__ > 199901L /* it's a keyword */ #else # if __GNUC_PREREQ (2,7) @@ -48,39 +48,29 @@ # define __const const #endif -#ifndef ATTRIBUTE_UNUSED # define ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -#endif /* ATTRIBUTE_UNUSED */ - -#ifndef ATTRIBUTE_NORETURN # define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) -#endif /* ATTRIBUTE_NORETURN */ - -#ifndef ATTRIBUTE_PACKED # define ATTRIBUTE_PACKED __attribute__ ((__packed__)) -#endif /* ATTRIBUTE_PACKED */ - -#ifndef ATTRIBUTE_ALIGNED # define ATTRIBUTE_ALIGNED(m) __attribute__ ((__aligned__(m))) -#endif /* ATTRIBUTE_ALIGNED */ - -#ifndef ATTRIBUTE_ALWAYS_INLINE # if __GNUC_PREREQ (3,0) # define ATTRIBUTE_ALWAYS_INLINE __attribute__ ((always_inline)) inline +# if !ENABLE_WERROR +# define ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +# else +# define ATTRIBUTE_DEPRECATED /* n/a */ +# endif # else # define ATTRIBUTE_ALWAYS_INLINE inline +# define ATTRIBUTE_DEPRECATED /* n/a */ # endif -#endif /* -fwhole-program makes all symbols local. The attribute externally_visible forces a symbol global. */ -#ifndef ATTRIBUTE_EXTERNALLY_VISIBLE # if __GNUC_PREREQ (4,1) # define ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((__externally_visible__)) # else # define ATTRIBUTE_EXTERNALLY_VISIBLE # endif /* GNUC >= 4.1 */ -#endif /* ATTRIBUTE_EXTERNALLY_VISIBLE */ /* We use __extension__ in some places to suppress -pedantic warnings about GCC extensions. This feature didn't work properly before @@ -91,6 +81,14 @@ # endif #endif +/* gcc-2.95 had no va_copy but only __va_copy. */ +#if !__GNUC_PREREQ (3,0) +# include +# if !defined va_copy && defined __va_copy +# define va_copy(d,s) __va_copy((d),(s)) +# endif +#endif + /* ---- Endian Detection ------------------------------------ */ #if (defined __digital__ && defined __unix__) @@ -114,9 +112,9 @@ #endif #if BB_BIG_ENDIAN -#define SWAP_BE16(x) x -#define SWAP_BE32(x) x -#define SWAP_BE64(x) x +#define SWAP_BE16(x) (x) +#define SWAP_BE32(x) (x) +#define SWAP_BE64(x) (x) #define SWAP_LE16(x) bswap_16(x) #define SWAP_LE32(x) bswap_32(x) #define SWAP_LE64(x) bswap_64(x) @@ -124,9 +122,9 @@ #define SWAP_BE16(x) bswap_16(x) #define SWAP_BE32(x) bswap_32(x) #define SWAP_BE64(x) bswap_64(x) -#define SWAP_LE16(x) x -#define SWAP_LE32(x) x -#define SWAP_LE64(x) x +#define SWAP_LE16(x) (x) +#define SWAP_LE32(x) (x) +#define SWAP_LE64(x) (x) #endif /* ---- Networking ------------------------------------------ */ @@ -141,6 +139,14 @@ typedef int socklen_t; #endif /* ---- Compiler dependent settings ------------------------- */ +#if (defined __digital__ && defined __unix__) +# undef HAVE_MNTENT_H +#else +# define HAVE_MNTENT_H 1 +#endif /* ___digital__ && __unix__ */ + +/* linux/loop.h relies on __u64. Make sure we have that as a proper type + * until userspace is widely fixed. */ #ifndef __GNUC__ #if defined __INTEL_COMPILER __extension__ typedef __signed__ long long __s64; @@ -148,28 +154,20 @@ __extension__ typedef unsigned long long __u64; #endif /* __INTEL_COMPILER */ #endif /* ifndef __GNUC__ */ -#if (defined __digital__ && defined __unix__) -# undef HAVE_STDBOOL_H -# undef HAVE_MNTENT_H -#else -# define HAVE_STDBOOL_H 1 -# define HAVE_MNTENT_H 1 -#endif /* ___digital__ && __unix__ */ - /*----- Kernel versioning ------------------------------------*/ -#ifdef __linux__ #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) -#endif /* ---- miscellaneous --------------------------------------- */ -#if __GNU_LIBRARY__ < 5 && \ +#if defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 5 && \ !defined(__dietlibc__) && \ !defined(_NEWLIB_VERSION) && \ !(defined __digital__ && defined __unix__) -#error "Sorry, this libc version is not supported :(" +# error "Sorry, this libc version is not supported :(" #endif +// Don't perpetuate e2fsck crap into the headers. Clean up e2fsck instead. + #if defined __GLIBC__ || defined __UCLIBC__ \ || defined __dietlibc__ || defined _NEWLIB_VERSION #include @@ -179,26 +177,79 @@ __extension__ typedef unsigned long long __u64; #else /* Largest integral types. */ #if __BIG_ENDIAN__ -typedef long int intmax_t; -typedef unsigned long int uintmax_t; +typedef long intmax_t; +typedef unsigned long uintmax_t; #else __extension__ -typedef long long int intmax_t; +typedef long long intmax_t; __extension__ -typedef unsigned long long int uintmax_t; +typedef unsigned long long uintmax_t; +#endif #endif + +/* Size-saving "small" ints (arch-dependent) */ +#if defined(i386) || defined(__x86_64__) || defined(__mips__) || defined(__cris__) +/* add other arches which benefit from this... */ +typedef signed char smallint; +typedef unsigned char smalluint; +#else +/* for arches where byte accesses generate larger code: */ +typedef int smallint; +typedef unsigned smalluint; #endif +/* ISO C Standard: 7.16 Boolean type and values */ #if (defined __digital__ && defined __unix__) -#include -#define HAVE_STANDARDS_H -#include -#define HAVE_INTTYPES_H -#define PRIu32 "u" +/* old system without (proper) C99 support */ +#define bool smalluint +#else +/* modern system, so use it */ +#include #endif -// Need to implement fdprintf for platforms that haven't got dprintf. + +/* uclibc does not implement daemon() for no-mmu systems. + * For 0.9.29 and svn, __ARCH_USE_MMU__ indicates no-mmu reliably. + * For earlier versions there is no reliable way to check if we are building + * for a mmu-less system; the user should pass EXTRA_CFLAGS="-DBB_NOMMU" + * on his own. + */ +#if defined __UCLIBC__ && __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && \ + __UCLIBC_SUBLEVEL__ > 28 && !defined __ARCH_USE_MMU__ +#define BB_MMU 0 +#define BB_NOMMU 1 +#define USE_FOR_NOMMU(...) __VA_ARGS__ +#define USE_FOR_MMU(...) +#else +#define BB_MMU 1 +/* BB_NOMMU is not defined in this case! */ +#define USE_FOR_NOMMU(...) +#define USE_FOR_MMU(...) __VA_ARGS__ +#endif + +/* Platforms that haven't got dprintf need to implement fdprintf() in + * libbb. This would require a platform.c. It's not going to be cleaned + * out of the tree, so stop saying it should be. */ +#if !defined(__dietlibc__) +/* Needed for: glibc */ +/* Not needed for: dietlibc */ +/* Others: ?? (add as needed) */ #define fdprintf dprintf +#endif + +#if defined(__dietlibc__) +static ATTRIBUTE_ALWAYS_INLINE char* strchrnul(const char *s, char c) +{ + while (*s && *s != c) ++s; + return (char*)s; +} +#endif + +/* Don't use lchown with glibc older than 2.1.x ... uClibc lacks it */ +#if (defined __GLIBC__ && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 1) || \ + defined __UC_LIBC__ +# define lchown chown +#endif /* THIS SHOULD BE CLEANED OUT OF THE TREE ENTIRELY */ /* FIXME: fix tar.c! */ @@ -206,16 +257,15 @@ typedef unsigned long long int uintmax_t; #define FNM_LEADING_DIR 0 #endif -/* move to platform.c */ #if (defined __digital__ && defined __unix__) -/* use legacy setpgrp(pidt_,pid_t) for now.. */ -#define bb_setpgrp do{pid_t __me = getpid();setpgrp(__me,__me);}while(0) -#else -#define bb_setpgrp setpgrp() -#endif +#include +#define HAVE_STANDARDS_H +#include +#define HAVE_INTTYPES_H +#define PRIu32 "u" -// I have no idea what platform this was for since aldot didn't say, but -// it belongs here since Linux doesn't need it. +/* use legacy setpgrp(pid_t,pid_t) for now. move to platform.c */ +#define bb_setpgrp() do { pid_t __me = getpid(); setpgrp(__me,__me); } while (0) #if !defined ADJ_OFFSET_SINGLESHOT && defined MOD_CLKA && defined MOD_OFFSET #define ADJ_OFFSET_SINGLESHOT (MOD_CLKA | MOD_OFFSET) @@ -230,4 +280,47 @@ typedef unsigned long long int uintmax_t; #define ADJ_TICK MOD_CLKB #endif +#else +#define bb_setpgrp() setpgrp() +#endif + +#if defined(__linux__) +#include +// Make sure we have all the new mount flags we actually try to use. +#ifndef MS_BIND +#define MS_BIND (1<<12) +#endif +#ifndef MS_MOVE +#define MS_MOVE (1<<13) +#endif +#ifndef MS_RECURSIVE +#define MS_RECURSIVE (1<<14) +#endif +#ifndef MS_SILENT +#define MS_SILENT (1<<15) +#endif + +// The shared subtree stuff, which went in around 2.6.15 +#ifndef MS_UNBINDABLE +#define MS_UNBINDABLE (1<<17) +#endif +#ifndef MS_PRIVATE +#define MS_PRIVATE (1<<18) +#endif +#ifndef MS_SLAVE +#define MS_SLAVE (1<<19) +#endif +#ifndef MS_SHARED +#define MS_SHARED (1<<20) +#endif + + +#if !defined(BLKSSZGET) +#define BLKSSZGET _IO(0x12, 104) +#endif +#if !defined(BLKGETSIZE64) +#define BLKGETSIZE64 _IOR(0x12,114,size_t) +#endif +#endif + #endif /* platform.h */