[gentoo-commits] gentoo commit in src/patchsets/gcc/4.7.2/gentoo: 48_all_x86_pr53113_libitm-avx.patch 49_all_gcc-4.7-x86-libitm-pr52695.patch 49_all_x86_pr52695_libitm-m64.patch README.history

[gentoo-commits] gentoo commit in src/patchsets/gcc/4.7.2/gentoo: 48_all_x86_pr53113_libitm-avx.patch 49_all_gcc-4.7-x86-libitm-pr52695.patch 49_all_x86_pr52695_libitm-m64.patch README.history

[Ryan Hill (dirtyepic)]

dirtyepic    13/02/23 19:41:24

  Modified:             README.history
  Added:                48_all_x86_pr53113_libitm-avx.patch
                        49_all_x86_pr52695_libitm-m64.patch
  Removed:              49_all_gcc-4.7-x86-libitm-pr52695.patch
  Log:
  Patch for bug #417271.

Revision  Changes    Path
1.8                  src/patchsets/gcc/4.7.2/gentoo/README.history

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.2/gentoo/README.history?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.2/gentoo/README.history?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.2/gentoo/README.history?r1=1.7&r2=1.8

Index: README.history
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/gcc/4.7.2/gentoo/README.history,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- README.history	21 Jan 2013 22:03:56 -0000	1.7
+++ README.history	23 Feb 2013 19:41:24 -0000	1.8
@@ -1,5 +1,8 @@
 1.4		[pending]
 	- 03_all_java-nomulti.patch
+	+ 48_all_x86_pr53113_libitm-avx.patch
+	- 49_all_gcc-4.7-x86-libitm-pr52695.patch
+	+ 49_all_x86_pr52695_libitm-m64.patch
 	+ 82_all_alpha_4.6.4_pr56023_bootstrap.patch
 
 1.3		04 Nov 2012



1.1                  src/patchsets/gcc/4.7.2/gentoo/48_all_x86_pr53113_libitm-avx.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.2/gentoo/48_all_x86_pr53113_libitm-avx.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.2/gentoo/48_all_x86_pr53113_libitm-avx.patch?rev=1.1&content-type=text/plain

Index: 48_all_x86_pr53113_libitm-avx.patch
===================================================================
libitm checks for AVX support in the assembler and adds -mavx to x86_avx.cc
which defines the needed typedefs.  User CFLAGS can override -mavx however,
so also use the fallback typedef if __AVX__ isn't defined.

https://bugs.gentoo.org/417271
http://gcc.gnu.org/PR53113


--- a/libitm/config/x86/x86_avx.cc
+++ b/libitm/config/x86/x86_avx.cc
@@ -29,7 +29,7 @@
 
 extern "C" {
 
-#ifndef HAVE_AS_AVX
+#if !defined (HAVE_AS_AVX) || !defined(__AVX__)
 // If we don't have an AVX capable assembler, we didn't set -mavx on the
 // command-line either, which means that libitm.h defined neither this type
 // nor the functions in this file.  Define the type and unconditionally
@@ -40,7 +40,7 @@ typedef float _ITM_TYPE_M256 __attribute__((vector_size(32), may_alias));
 // Re-define the memcpy implementations so that we can frob the
 // interface to deal with possibly missing AVX instruction set support.
 
-#ifdef HAVE_AS_AVX
+#if defined(HAVE_AS_AVX) && defined(__AVX__)
 #define RETURN(X)	return X
 #define STORE(X,Y)	X = Y
 #define OUTPUT(T)	_ITM_TYPE_##T



1.1                  src/patchsets/gcc/4.7.2/gentoo/49_all_x86_pr52695_libitm-m64.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.2/gentoo/49_all_x86_pr52695_libitm-m64.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/gcc/4.7.2/gentoo/49_all_x86_pr52695_libitm-m64.patch?rev=1.1&content-type=text/plain

Index: 49_all_x86_pr52695_libitm-m64.patch
===================================================================
http://gcc.gnu.org/PR52695
https://bugs.gentoo.org/421305

fix building on x86 systems

--- a/libitm/config/x86/target.h
+++ b/libitm/config/x86/target.h
@@ -69,16 +69,4 @@
 } // namespace GTM
 
 // We'll be using some of the cpu builtins, and their associated types.
-#ifndef __cplusplus
-/* ??? It's broken for C++. */
 #include <x86intrin.h>
-#else
-# ifdef __SSE2__
-#  include <emmintrin.h>
-# elif defined(__SSE__)
-#  include <xmmintrin.h>
-# endif
-# ifdef __AVX__
-#  include <immintrin.h>
-# endif
-#endif