Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use any inlined functions provided by machine/byte_swap.h even when

Browse Source 
optimisation is disabled (mmm bloated code..).
Fixes hp700 kernel build.
This commit is contained in:
dsl 2006-02-04 11:44:48 +00:00
parent 9485c8d272
commit d85485aca1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/sys/bswap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bswap.h,v 1.9 2006/02/04 10:34:43 skrll Exp $ */
/* $NetBSD: bswap.h,v 1.10 2006/02/04 11:44:48 dsl Exp $ */
/* Written by Manuel Bouyer. Public domain */
@ -23,8 +23,6 @@ uint32_t bswap32(uint32_t) __RENAME(__bswap32) __attribute__((__const__));
uint64_t bswap64(uint64_t) __attribute__((__const__));
__END_DECLS
#if defined(__GNUC__) && defined(__OPTIMIZE__)
/* machine/byte_swap.h might have defined inline versions */
#ifndef __BYTE_SWAP_U64_VARIABLE
#define __BYTE_SWAP_U64_VARIABLE bswap64
@ -38,6 +36,8 @@ __END_DECLS
#define __BYTE_SWAP_U16_VARIABLE bswap16
#endif
#if defined(__GNUC__) && defined(__OPTIMIZE__)
#define __byte_swap_u64_constant(x) \
((((x) & 0xff00000000000000ull) >> 56) | \
(((x) & 0x00ff000000000000ull) >> 40) | \
@ -70,6 +70,13 @@ __END_DECLS
(__builtin_constant_p((x)) ? \
__byte_swap_u16_constant(x) : __BYTE_SWAP_U16_VARIABLE(x))
#else
/* Use any inlined functions even when not optimising */
#define bswap64(x) __BYTE_SWAP_U64_VARIABLE(x)
#define bswap32(x) __BYTE_SWAP_U32_VARIABLE(x)
#define bswap16(x) __BYTE_SWAP_U16_VARIABLE(x)
#endif /* __GNUC__ && __OPTIMIZE__ */
#endif /* !_LOCORE */