This change sanitizes the x86-specific platform headers and libraries. It does two things: - Remove the stuff under android-3/arch-x86 - Update the content of android-9/arch-x86 from a recent AOSP full_x86-eng build (see caveats below). Some files appear to move because they didn't change (e.g. kernel headers). This change was generated by following these steps: 1/ Build full_x86-eng from the AOSP tree 2/ From $ANDROID_ROOT/ndk, run: build/tools/dev-system-import.sh --direct --arch=x86 9 3/ Under $ANDROID_ROOT/development/ndk, do: git rm -r android-3/arch-x86 git add android-9/arch-x86 git checkout -- android-9/include git ls-files -o | xargs rm git commit IMPORTANT: The AOSP tip-of-tree used to generate these files includes post-Gingerbread changes !! The final version of the android-9/arch-x86 files will have to be generated from the gingerbread branch after we back-port all x86-support changes to it. These binaries are thus not final, but can be used to generate working experimental NDK packages, including prebuilt GNU libstdc++ and STLport binaries that implement -fstack-protector correctly. Change-Id: I260896185a098b9b356bd26f492692e4a4f66f8f
71 lines
2.4 KiB
C
71 lines
2.4 KiB
C
/* $OpenBSD: endian.h,v 1.14 2005/12/13 00:35:23 millert Exp $ */
|
|
|
|
/*-
|
|
* Copyright (c) 1997 Niklas Hallqvist. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _I386_ENDIAN_H_
|
|
#define _I386_ENDIAN_H_
|
|
|
|
#ifdef __GNUC__
|
|
|
|
#if defined(_KERNEL) && !defined(I386_CPU)
|
|
#define __swap32md(x) ({ \
|
|
uint32_t __swap32md_x = (x); \
|
|
\
|
|
__asm ("bswap %1" : "+r" (__swap32md_x)); \
|
|
__swap32md_x; \
|
|
})
|
|
#else
|
|
#define __swap32md(x) ({ \
|
|
uint32_t __swap32md_x = (x); \
|
|
\
|
|
__asm ("rorw $8, %w1; rorl $16, %1; rorw $8, %w1" : \
|
|
"+r" (__swap32md_x)); \
|
|
__swap32md_x; \
|
|
})
|
|
#endif /* _KERNEL && !I386_CPU */
|
|
|
|
#define __swap64md(x) ({ \
|
|
uint64_t __swap64md_x = (x); \
|
|
\
|
|
(uint64_t)__swap32md(__swap64md_x >> 32) | \
|
|
(uint64_t)__swap32md(__swap64md_x & 0xffffffff) << 32; \
|
|
})
|
|
#define __swap16md(x) ({ \
|
|
uint16_t __swap16md_x = (x); \
|
|
\
|
|
__asm ("rorw $8, %w1" : "+r" (__swap16md_x)); \
|
|
__swap16md_x; \
|
|
})
|
|
|
|
/* Tell sys/endian.h we have MD variants of the swap macros. */
|
|
#define MD_SWAP
|
|
|
|
#endif /* __GNUC__ */
|
|
|
|
#define _BYTE_ORDER _LITTLE_ENDIAN
|
|
#include <sys/endian.h>
|
|
|
|
#endif /* _I386_ENDIAN_H_ */
|