Make LABELALIGN to 32 bytes for 32 bit x86 NaCL

BUG=none
TEST=ncval
R=nfullagar@google.com

Review URL: https://webrtc-codereview.appspot.com/6089004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@918 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-12-18 00:53:02 +00:00
parent b14f46fa30
commit 55b911ce7b
3 changed files with 10 additions and 6 deletions

View File

@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 915
Version: 918
License: BSD
License File: LICENSE

View File

@ -35,6 +35,9 @@ extern "C" {
#define LIBYUV_SSSE3_ONLY
#endif
// Enable for NaCL pepper 33 for bundle and AVX2 support.
//#define NEW_BINUTILS
// The following are available on all x86 platforms:
#if !defined(LIBYUV_DISABLE_X86) && \
(defined(_M_IX86) || defined(__x86_64__) || defined(__i386__))
@ -373,6 +376,11 @@ typedef uint8 uvec8[16];
// TODO(nfullagar): When pepper_33 toolchain is distributed, default to
// NEW_BINUTILS and remove all BUNDLEALIGN occurances.
#if defined(__native_client__)
#define LABELALIGN ".p2align 5\n"
#else
#define LABELALIGN ".p2align 2\n"
#endif
#if defined(__native_client__) && defined(__x86_64__)
#if defined(NEW_BINUTILS)
#define BUNDLELOCK ".bundle_lock\n"
@ -383,7 +391,6 @@ typedef uint8 uvec8[16];
#define BUNDLEUNLOCK "\n"
#define BUNDLEALIGN ".p2align 5\n"
#endif
#define LABELALIGN ".p2align 5\n"
#define MEMACCESS(base) "%%nacl:(%%r15,%q" #base ")"
#define MEMACCESS2(offset, base) "%%nacl:" #offset "(%%r15,%q" #base ")"
#define MEMLEA(offset, base) #offset "(%q" #base ")"
@ -409,10 +416,7 @@ typedef uint8 uvec8[16];
#opcode " (%%r15,%%r14),%" #arg "\n" \
BUNDLEUNLOCK
#else
#define BUNDLELOCK "\n"
#define BUNDLEUNLOCK "\n"
#define BUNDLEALIGN "\n"
#define LABELALIGN ".p2align 2\n"
#define MEMACCESS(base) "(%" #base ")"
#define MEMACCESS2(offset, base) #offset "(%" #base ")"
#define MEMLEA(offset, base) #offset "(%" #base ")"

View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 915
#define LIBYUV_VERSION 918
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT