From 24bb7432a7fe70c1fc607b60a389ce64aa903e0d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 25 Jan 2015 10:08:04 +0100 Subject: [PATCH] m68k: force inlining bswap functions --- ChangeLog | 5 +++++ sysdeps/m68k/bits/byteswap.h | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 951aa27dc6..3af3543460 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-01-25 Andreas Schwab + + * sysdeps/m68k/bits/byteswap.h (__bswap_16, __bswap_32) + (__bswap_64): Mark as __always_inline. + 2015-01-25 Bram [BZ #15378] diff --git a/sysdeps/m68k/bits/byteswap.h b/sysdeps/m68k/bits/byteswap.h index 1e0b047783..a8deeaa514 100644 --- a/sysdeps/m68k/bits/byteswap.h +++ b/sysdeps/m68k/bits/byteswap.h @@ -29,7 +29,7 @@ #define __bswap_constant_16(x) \ ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) -static __inline unsigned short int +static __always_inline unsigned short int __bswap_16 (unsigned short int __bsx) { return __bswap_constant_16 (__bsx); @@ -41,7 +41,7 @@ __bswap_16 (unsigned short int __bsx) (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) #if !defined(__mcoldfire__) -static __inline unsigned int +static __always_inline unsigned int __bswap_32 (unsigned int __bsx) { if (__builtin_constant_p (__bsx)) @@ -53,7 +53,7 @@ __bswap_32 (unsigned int __bsx) return __bsx; } #else -static __inline unsigned int +static __always_inline unsigned int __bswap_32 (unsigned int __bsx) { return __bswap_constant_32 (__bsx); @@ -75,7 +75,7 @@ __bswap_32 (unsigned int __bsx) /* Swap bytes in 64 bit value. */ __extension__ -static __inline unsigned long long +static __always_inline unsigned long long __bswap_64 (unsigned long long __bsx) { if (__builtin_constant_p (__bsx)) -- 2.11.4.GIT