d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add parentheses around the argument 'x' used in the __bswapXX(x) macros. Revert

Browse Source 
r211130 in favor of this more general fix.

This fixes a compilation error for mips 64-bit little endian build.
libexec/rtld-elf/mips/reloc.c:196: warning: right shift count >= width of type

Suggested by:	stefanf, jchandra, bde
This commit is contained in:
Neel Natu 2010-08-11 02:28:39 +00:00
parent 5f7eb1ff54
commit 247d222548
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libexec/rtld-elf/mips/reloc.c
View File

@ -83,7 +83,7 @@ void _rtld_relocate_nonplt_self(Elf_Dyn *, Elf_Addr);
#undef ELF_R_SYM
#undef ELF_R_TYPE
#define ELF_R_SYM(r_info) ((r_info) & 0xffffffff)
#define ELF_R_TYPE(r_info) bswap32(((r_info) >> 32))
#define ELF_R_TYPE(r_info) bswap32((r_info) >> 32)
#endif
#else
#define ELF_R_NXTTYPE_64_P(r_type) (0)

12
sys/mips/include/endian.h
View File

@ -108,12 +108,12 @@ __bswap64_var(__uint64_t _x)
((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
}
#define __bswap16(x) (__uint16_t)(__is_constant(x) ? \
__bswap16_const((__uint16_t)x) : __bswap16_var((__uint16_t)x))
#define __bswap32(x) (__uint32_t)(__is_constant(x) ? \
__bswap32_const((__uint32_t)x) : __bswap32_var((__uint32_t)x))
#define __bswap64(x) (__uint64_t)(__is_constant(x) ? \
__bswap64_const((__uint64_t)x) : __bswap64_var((__uint64_t)x))
#define __bswap16(x) ((__uint16_t)(__is_constant((x)) ? \
__bswap16_const((__uint16_t)(x)) : __bswap16_var((__uint16_t)(x))))
#define __bswap32(x) ((__uint32_t)(__is_constant((x)) ? \
__bswap32_const((__uint32_t)(x)) : __bswap32_var((__uint32_t)(x))))
#define __bswap64(x) ((__uint64_t)(__is_constant((x)) ? \
__bswap64_const((__uint64_t)(x)) : __bswap64_var((__uint64_t)(x))))
#ifdef __MIPSEB__
#define __htonl(x) ((__uint32_t)(x))