From patchwork Mon Nov  7 10:25:50 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Uros Bizjak <ubizjak@gmail.com>
X-Patchwork-Id: 124044
Return-Path: 
 <gcc-patches-return-307013-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id 069F41007D3
	for <incoming@patchwork.ozlabs.org>;
	Mon,  7 Nov 2011 21:26:10 +1100 (EST)
Received: (qmail 1858 invoked by alias); 7 Nov 2011 10:26:08 -0000
Received: (qmail 1832 invoked by uid 22791); 7 Nov 2011 10:26:07 -0000
X-SWARE-Spam-Status: No, hits=-2.3 required=5.0	tests=AWL, BAYES_00,
	DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM,
	RCVD_IN_DNSWL_LOW, TW_ZJ
X-Spam-Check-By: sourceware.org
Received: from mail-yw0-f47.google.com (HELO mail-yw0-f47.google.com)
	(209.85.213.47) by sourceware.org (qpsmtpd/0.43rc1) with
	ESMTP; Mon, 07 Nov 2011 10:25:52 +0000
Received: by ywf9 with SMTP id 9so5655623ywf.20 for
	<gcc-patches@gcc.gnu.org>; Mon, 07 Nov 2011 02:25:52 -0800 (PST)
MIME-Version: 1.0
Received: by 10.236.181.225 with SMTP id l61mr33487662yhm.131.1320661550880;
	Mon, 07 Nov 2011 02:25:50 -0800 (PST)
Received: by 10.147.114.16 with HTTP; Mon, 7 Nov 2011 02:25:50 -0800 (PST)
Date: Mon, 7 Nov 2011 11:25:50 +0100
Message-ID: 
 <CAFULd4apWHhOzOMxJg850nmpBK3SoZEmqhwKvz=biQX5c-doeA@mail.gmail.com>
Subject: Re: Many testsuite failures on x86_64 due recent "fix" about
	f16cintrin.h header
From: Uros Bizjak <ubizjak@gmail.com>
To: gcc-patches@gcc.gnu.org
Cc: Quentin Neill <quentin.neill.gnu@gmail.com>,
	Dominique Dhumieres <dominiq@lps.ens.fr>
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

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.

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 */