generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes I9347ab44,I3f080b34

Browse Source 
* changes:
  use consistent guards for off_t and size_t defines for IA
  Simplify variable typing for IA builds
This commit is contained in:
Jean-Baptiste Queru 2011-01-07 11:39:25 -08:00 committed by Android Code Review
commit f588772b05
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libc/arch-x86/include/endian.h
View File

@ -31,14 +31,14 @@
#if defined(_KERNEL) && !defined(I386_CPU) #if defined(_KERNEL) && !defined(I386_CPU)
#define __swap32md(x) ({ \ #define __swap32md(x) ({ \
u_int32_t __swap32md_x = (x); \ uint32_t __swap32md_x = (x); \
\ \
__asm ("bswap %1" : "+r" (__swap32md_x)); \ __asm ("bswap %1" : "+r" (__swap32md_x)); \
__swap32md_x; \ __swap32md_x; \
}) })
#else #else
#define __swap32md(x) ({ \ #define __swap32md(x) ({ \
u_int32_t __swap32md_x = (x); \ uint32_t __swap32md_x = (x); \
\ \
__asm ("rorw $8, %w1; rorl $16, %1; rorw $8, %w1" : \ __asm ("rorw $8, %w1; rorl $16, %1; rorw $8, %w1" : \
"+r" (__swap32md_x)); \ "+r" (__swap32md_x)); \
@ -47,13 +47,13 @@
#endif /* _KERNEL && !I386_CPU */ #endif /* _KERNEL && !I386_CPU */
#define __swap64md(x) ({ \ #define __swap64md(x) ({ \
u_int64_t __swap64md_x = (x); \ uint64_t __swap64md_x = (x); \
\ \
(u_int64_t)__swap32md(__swap64md_x >> 32) | \ (uint64_t)__swap32md(__swap64md_x >> 32) | \
(u_int64_t)__swap32md(__swap64md_x & 0xffffffff) << 32; \ (uint64_t)__swap32md(__swap64md_x & 0xffffffff) << 32; \
}) })
#define __swap16md(x) ({ \ #define __swap16md(x) ({ \
u_int16_t __swap16md_x = (x); \ uint16_t __swap16md_x = (x); \
\ \
__asm ("rorw $8, %w1" : "+r" (__swap16md_x)); \ __asm ("rorw $8, %w1" : "+r" (__swap16md_x)); \
__swap16md_x; \ __swap16md_x; \

7
libc/arch-x86/include/machine/_types.h
View File

@ -36,8 +36,8 @@
#define _I386__TYPES_H_ #define _I386__TYPES_H_
/* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */ /* the kernel defines size_t as unsigned int, but g++ wants it to be unsigned long */
#ifndef _SIZE_T #ifndef _SIZE_T_DEFINED_
# define _SIZE_T # define _SIZE_T_DEFINED_
# ifdef ANDROID # ifdef ANDROID
typedef unsigned int size_t; typedef unsigned int size_t;
# else # else
@ -54,9 +54,6 @@ typedef long int ssize_t;
typedef long ptrdiff_t; typedef long ptrdiff_t;
#endif #endif
#define _OFF_T_DEFINED_
#define _SIZE_T_DEFINED_
#include <linux/types.h> #include <linux/types.h>
/* 7.18.1.1 Exact-width integer types */ /* 7.18.1.1 Exact-width integer types */