# HG changeset patch # User John Donoghue # Date 1415823003 18000 # Node ID eba1c6e9cbb8f537c4fd324338de3428204f1816 # Parent cde7e614b3e2e9b861e89e8769fe0254694d9194 build-gcc, native-gcc: update to version 4.9.2 (from mxe (devel)) * src/build-gcc-2-intrinsics.patc: update patch * src/build-gcc.mk: update version,checksum * src/native-gcc-1-intrinsics.patch: update patch * src/native-gcc.mk: update version, checksum diff -r cde7e614b3e2 -r eba1c6e9cbb8 src/build-gcc-2-intrinsics.patch --- a/src/build-gcc-2-intrinsics.patch Wed Nov 12 09:48:00 2014 -0500 +++ b/src/build-gcc-2-intrinsics.patch Wed Nov 12 15:10:03 2014 -0500 @@ -55,7 +55,7 @@ #undef __DISABLE_SSE4A__ #pragma GCC pop_options diff --git a/gcc/config/i386/avx2intrin.h b/gcc/config/i386/avx2intrin.h -index d04c972..9302273 100644 +index d04c972..2c0d6e7 100644 --- a/gcc/config/i386/avx2intrin.h +++ b/gcc/config/i386/avx2intrin.h @@ -34,6 +34,10 @@ @@ -69,17 +69,17 @@ /* Sum absolute 8-bit integer difference of adjacent groups of 4 byte integers in the first 2 operands. Starting offsets within operands are determined by the 3rd mask operand. */ -@@ -1887,3 +1891,8 @@ _mm256_mask_i64gather_epi32 (__m128i src, int const *base, +@@ -1886,4 +1890,8 @@ _mm256_mask_i64gather_epi32 (__m128i src, int const *base, + #pragma GCC pop_options #endif /* __DISABLE_AVX2__ */ - #endif /* _AVX2INTRIN_H_INCLUDED */ -+ +#ifdef __cplusplus +} +#endif + + #endif /* _AVX2INTRIN_H_INCLUDED */ diff --git a/gcc/config/i386/avxintrin.h b/gcc/config/i386/avxintrin.h -index 2ea327c..32591da 100644 +index 2ea327c..f61d850 100644 --- a/gcc/config/i386/avxintrin.h +++ b/gcc/config/i386/avxintrin.h @@ -37,6 +37,10 @@ @@ -93,15 +93,15 @@ /* Internal data types for implementing the intrinsics. */ typedef double __v4df __attribute__ ((__vector_size__ (32))); typedef float __v8sf __attribute__ ((__vector_size__ (32))); -@@ -1461,3 +1465,8 @@ _mm256_castsi128_si256 (__m128i __A) +@@ -1460,4 +1464,8 @@ _mm256_castsi128_si256 (__m128i __A) + #pragma GCC pop_options #endif /* __DISABLE_AVX__ */ - #endif /* _AVXINTRIN_H_INCLUDED */ -+ +#ifdef __cplusplus +} +#endif + + #endif /* _AVXINTRIN_H_INCLUDED */ diff --git a/gcc/config/i386/bmi2intrin.h b/gcc/config/i386/bmi2intrin.h index ff96296..b01e1e1 100644 --- a/gcc/config/i386/bmi2intrin.h @@ -325,7 +325,7 @@ + #endif /* _MM_MALLOC_H_INCLUDED */ diff --git a/gcc/config/i386/ia32intrin.h b/gcc/config/i386/ia32intrin.h -index 5e7c893..a7fa538 100644 +index 614b0fa..d8e474e 100644 --- a/gcc/config/i386/ia32intrin.h +++ b/gcc/config/i386/ia32intrin.h @@ -25,6 +25,10 @@ @@ -339,7 +339,7 @@ /* 32bit bsf */ extern __inline int __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -@@ -291,3 +295,7 @@ __writeeflags (unsigned int X) +@@ -297,3 +301,7 @@ __writeeflags (unsigned int X) #define _rotwr(a,b) __rorw((a), (b)) #define _rotl(a,b) __rold((a), (b)) #define _rotr(a,b) __rord((a), (b)) @@ -616,7 +616,7 @@ + #endif /* _RTMINTRIN_H_INCLUDED */ diff --git a/gcc/config/i386/smmintrin.h b/gcc/config/i386/smmintrin.h -index 886ace4..168b903 100644 +index 886ace4..0922b45 100644 --- a/gcc/config/i386/smmintrin.h +++ b/gcc/config/i386/smmintrin.h @@ -37,6 +37,10 @@ @@ -630,18 +630,17 @@ /* Rounding mode macros. */ #define _MM_FROUND_TO_NEAREST_INT 0x00 #define _MM_FROUND_TO_NEG_INF 0x01 -@@ -820,6 +824,11 @@ _mm_cmpgt_epi64 (__m128i __X, __m128i __Y) - #pragma GCC push_options - #pragma GCC target("sse4.2") +@@ -822,6 +826,10 @@ _mm_cmpgt_epi64 (__m128i __X, __m128i __Y) #define __DISABLE_SSE4_2__ -+ + #endif /* __SSE4_1__ */ + +#ifdef __cplusplus +} +#endif + - #endif /* __SSE4_1__ */ - /* Accumulate CRC32 (polynomial 0x11EDC6F41) value. */ + extern __inline unsigned int __attribute__((__gnu_inline__, __always_inline__, __artificial__)) + _mm_crc32_u8 (unsigned int __C, unsigned char __V) diff --git a/gcc/config/i386/tbmintrin.h b/gcc/config/i386/tbmintrin.h index 871f532..744b9ca 100644 --- a/gcc/config/i386/tbmintrin.h diff -r cde7e614b3e2 -r eba1c6e9cbb8 src/build-gcc.mk --- a/src/build-gcc.mk Wed Nov 12 09:48:00 2014 -0500 +++ b/src/build-gcc.mk Wed Nov 12 15:10:03 2014 -0500 @@ -3,8 +3,8 @@ PKG := build-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 4.9.1 -$(PKG)_CHECKSUM := 3f303f403053f0ce79530dae832811ecef91197e +$(PKG)_VERSION := 4.9.2 +$(PKG)_CHECKSUM := 79dbcb09f44232822460d80b033c962c0237c6d8 $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) diff -r cde7e614b3e2 -r eba1c6e9cbb8 src/native-gcc-2-intrinsics.patch --- a/src/native-gcc-2-intrinsics.patch Wed Nov 12 09:48:00 2014 -0500 +++ b/src/native-gcc-2-intrinsics.patch Wed Nov 12 15:10:03 2014 -0500 @@ -55,7 +55,7 @@ #undef __DISABLE_SSE4A__ #pragma GCC pop_options diff --git a/gcc/config/i386/avx2intrin.h b/gcc/config/i386/avx2intrin.h -index d04c972..9302273 100644 +index d04c972..2c0d6e7 100644 --- a/gcc/config/i386/avx2intrin.h +++ b/gcc/config/i386/avx2intrin.h @@ -34,6 +34,10 @@ @@ -69,17 +69,17 @@ /* Sum absolute 8-bit integer difference of adjacent groups of 4 byte integers in the first 2 operands. Starting offsets within operands are determined by the 3rd mask operand. */ -@@ -1887,3 +1891,8 @@ _mm256_mask_i64gather_epi32 (__m128i src, int const *base, +@@ -1886,4 +1890,8 @@ _mm256_mask_i64gather_epi32 (__m128i src, int const *base, + #pragma GCC pop_options #endif /* __DISABLE_AVX2__ */ - #endif /* _AVX2INTRIN_H_INCLUDED */ -+ +#ifdef __cplusplus +} +#endif + + #endif /* _AVX2INTRIN_H_INCLUDED */ diff --git a/gcc/config/i386/avxintrin.h b/gcc/config/i386/avxintrin.h -index 2ea327c..32591da 100644 +index 2ea327c..f61d850 100644 --- a/gcc/config/i386/avxintrin.h +++ b/gcc/config/i386/avxintrin.h @@ -37,6 +37,10 @@ @@ -93,15 +93,15 @@ /* Internal data types for implementing the intrinsics. */ typedef double __v4df __attribute__ ((__vector_size__ (32))); typedef float __v8sf __attribute__ ((__vector_size__ (32))); -@@ -1461,3 +1465,8 @@ _mm256_castsi128_si256 (__m128i __A) +@@ -1460,4 +1464,8 @@ _mm256_castsi128_si256 (__m128i __A) + #pragma GCC pop_options #endif /* __DISABLE_AVX__ */ - #endif /* _AVXINTRIN_H_INCLUDED */ -+ +#ifdef __cplusplus +} +#endif + + #endif /* _AVXINTRIN_H_INCLUDED */ diff --git a/gcc/config/i386/bmi2intrin.h b/gcc/config/i386/bmi2intrin.h index ff96296..b01e1e1 100644 --- a/gcc/config/i386/bmi2intrin.h @@ -325,7 +325,7 @@ + #endif /* _MM_MALLOC_H_INCLUDED */ diff --git a/gcc/config/i386/ia32intrin.h b/gcc/config/i386/ia32intrin.h -index 5e7c893..a7fa538 100644 +index 614b0fa..d8e474e 100644 --- a/gcc/config/i386/ia32intrin.h +++ b/gcc/config/i386/ia32intrin.h @@ -25,6 +25,10 @@ @@ -339,7 +339,7 @@ /* 32bit bsf */ extern __inline int __attribute__((__gnu_inline__, __always_inline__, __artificial__)) -@@ -291,3 +295,7 @@ __writeeflags (unsigned int X) +@@ -297,3 +301,7 @@ __writeeflags (unsigned int X) #define _rotwr(a,b) __rorw((a), (b)) #define _rotl(a,b) __rold((a), (b)) #define _rotr(a,b) __rord((a), (b)) @@ -616,7 +616,7 @@ + #endif /* _RTMINTRIN_H_INCLUDED */ diff --git a/gcc/config/i386/smmintrin.h b/gcc/config/i386/smmintrin.h -index 886ace4..168b903 100644 +index 886ace4..0922b45 100644 --- a/gcc/config/i386/smmintrin.h +++ b/gcc/config/i386/smmintrin.h @@ -37,6 +37,10 @@ @@ -630,18 +630,17 @@ /* Rounding mode macros. */ #define _MM_FROUND_TO_NEAREST_INT 0x00 #define _MM_FROUND_TO_NEG_INF 0x01 -@@ -820,6 +824,11 @@ _mm_cmpgt_epi64 (__m128i __X, __m128i __Y) - #pragma GCC push_options - #pragma GCC target("sse4.2") +@@ -822,6 +826,10 @@ _mm_cmpgt_epi64 (__m128i __X, __m128i __Y) #define __DISABLE_SSE4_2__ -+ + #endif /* __SSE4_1__ */ + +#ifdef __cplusplus +} +#endif + - #endif /* __SSE4_1__ */ - /* Accumulate CRC32 (polynomial 0x11EDC6F41) value. */ + extern __inline unsigned int __attribute__((__gnu_inline__, __always_inline__, __artificial__)) + _mm_crc32_u8 (unsigned int __C, unsigned char __V) diff --git a/gcc/config/i386/tbmintrin.h b/gcc/config/i386/tbmintrin.h index 871f532..744b9ca 100644 --- a/gcc/config/i386/tbmintrin.h diff -r cde7e614b3e2 -r eba1c6e9cbb8 src/native-gcc.mk --- a/src/native-gcc.mk Wed Nov 12 09:48:00 2014 -0500 +++ b/src/native-gcc.mk Wed Nov 12 15:10:03 2014 -0500 @@ -3,8 +3,8 @@ PKG := native-gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 4.9.1 -$(PKG)_CHECKSUM := 3f303f403053f0ce79530dae832811ecef91197e +$(PKG)_VERSION := 4.9.2 +$(PKG)_CHECKSUM := 79dbcb09f44232822460d80b033c962c0237c6d8 $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)