diff --git a/README.chromium b/README.chromium index 0e0080764..c63cd045d 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 519 +Version: 520 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 0c617e760..acaea0831 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 519 +#define LIBYUV_VERSION 520 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/memcpy_mips.S b/source/memcpy_mips.S index 722ef4fcf..29662ab6e 100644 --- a/source/memcpy_mips.S +++ b/source/memcpy_mips.S @@ -8,6 +8,11 @@ # in the file PATENTS. All contributing project authors may # be found in the AUTHORS file in the root of the source tree. # +#if defined(__linux__) && defined(__ELF__) +.section .note.GNU-stack,"",%progbits +#endif + .text + .globl memcpy_MIPS; .align 2; .type memcpy_MIPS,@function;