Patchwork Many testsuite failures on x86_64 due recent "fix" about f16cintrin.h header

login
register
mail settings
Submitter Uros Bizjak
Date Nov. 7, 2011, 10:25 a.m.
Message ID <CAFULd4apWHhOzOMxJg850nmpBK3SoZEmqhwKvz=biQX5c-doeA@mail.gmail.com>
Download mbox | patch
Permalink /patch/124044/
State New
Headers show

Comments

Uros Bizjak - Nov. 7, 2011, 10:25 a.m.
Hello!

Attached patch fixes all remaining i386 testsuite failures. The header
did say that we can include it also through immintrin.h ...

2011-11-07  Uros Bizjak  <ubizjak@gmail.com>

	* config/i386/f16cintrin: Remove extra _X86INTRIN_H_INCLUDED check.

Tested on x86_64-pc-linux-gnu {,-m32}, committed to mainline SVN.

Uros.
Quentin Neill - Nov. 7, 2011, 3:02 p.m.
On Mon, Nov 7, 2011 at 4:25 AM, Uros Bizjak <ubizjak@gmail.com> wrote:
> Hello!
>
> Attached patch fixes all remaining i386 testsuite failures. The header
> did say that we can include it also through immintrin.h ...
>
> 2011-11-07  Uros Bizjak  <ubizjak@gmail.com>
>
>        * config/i386/f16cintrin: Remove extra _X86INTRIN_H_INCLUDED check.
>
> Tested on x86_64-pc-linux-gnu {,-m32}, committed to mainline SVN.
>
> Uros.

Thank you Dominique, Uros, Kai, and Eric.

Patch

Index: f16cintrin.h
===================================================================
--- f16cintrin.h	(revision 181071)
+++ f16cintrin.h	(working copy)
@@ -1,5 +1,4 @@ 
-/* Copyright (C) 2011
-   Free Software Foundation, Inc.
+/* Copyright (C) 2011 Free Software Foundation, Inc.
 
    This file is part of GCC.
 
@@ -22,8 +21,7 @@ 
    see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _X86INTRIN_H_INCLUDED
-#if (!defined(_X86INTRIN_H_INCLUDED) && !defined(_IMMINTRIN_H_INCLUDED))
+#if !defined _X86INTRIN_H_INCLUDED && !defined _IMMINTRIN_H_INCLUDED
 # error "Never use <f16intrin.h> directly; include <x86intrin.h> or <immintrin.h> instead."
 #endif
 
@@ -89,6 +87,6 @@ 
 #define _mm256_cvtps_ph(A, I) \
   ((__m128i) __builtin_ia32_vcvtps2ph256 ((__v8sf)(__m256) A, (int) (I)))
 #endif /* __OPTIMIZE */
+
 #endif /* _F16CINTRIN_H_INCLUDED */
 #endif /* __F16C__ */
-#endif /* _X86INTRIN_H_INCLUDED */