From patchwork Fri Feb 17 17:09:09 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Joseph Myers <joseph@codesourcery.com>
X-Patchwork-Id: 19286
Received: (qmail 75378 invoked by alias); 17 Feb 2017 17:09:30 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 75363 invoked by uid 89); 17 Feb 2017 17:09:29 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00,
	GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,
	RCVD_IN_DNSWL_NONE, SPF_PASS,
	URIBL_RED autolearn=ham version=3.3.2 spammy=H*Ad:U*fw
X-HELO: relay1.mentorg.com
Date: Fri, 17 Feb 2017 17:09:09 +0000
From: Joseph Myers <joseph@codesourcery.com>
To: Zack Weinberg <zackw@panix.com>
CC: Florian Weimer <fw@deneb.enyo.de>, GNU C Library
	<libc-alpha@sourceware.org>
Subject: Re: RFC: Run libm tests separately for each function
In-Reply-To: 
 <CAKCAbMjtVYTx0+FMsic9Ktvp3QaSWTLEbiCScS9pPpNAfek-0A@mail.gmail.com>
Message-ID: <alpine.DEB.2.20.1702171708400.17504@digraph.polyomino.org.uk>
References: <alpine.DEB.2.20.1702162305250.14439@digraph.polyomino.org.uk>
	<871suxmf9c.fsf@mid.deneb.enyo.de>
	<alpine.DEB.2.20.1702171327230.10884@digraph.polyomino.org.uk>
	<87o9y0iy15.fsf@mid.deneb.enyo.de>
	<CAKCAbMjtVYTx0+FMsic9Ktvp3QaSWTLEbiCScS9pPpNAfek-0A@mail.gmail.com>
User-Agent: Alpine 2.20 (DEB 67 2015-01-07)
MIME-Version: 1.0
X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To
	svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1)

On Fri, 17 Feb 2017, Zack Weinberg wrote:

> Please go ahead and back out the changes to
> sysdeps/x86_64/fpu/math-tests-arch.h and
> sysdeps/x86_64/multiarch/test-multiarch.h.  Those two changes seemed
> like they would be safe by themselves, although they're only
> _necessary_ in the context of my larger patchset, but I guess not.

Done thus.  Committed.

Revert header inclusion changes that break math/ testing on x86_64.

2017-02-17  Joseph Myers  <joseph@codesourcery.com>

	Revert:
	2017-02-16  Zack Weinberg  <zackw@panix.com>

	* sysdeps/x86_64/fpu/math-tests-arch.h: Include cpu-features.h.
	Don't include init-arch.h.
	* sysdeps/x86_64/multiarch/test-multiarch.h: Include cpu-features.h.
	Don't include init-arch.h.

diff --git a/sysdeps/x86_64/fpu/math-tests-arch.h b/sysdeps/x86_64/fpu/math-tests-arch.h
index 9278e34..98f7cf6 100644
--- a/sysdeps/x86_64/fpu/math-tests-arch.h
+++ b/sysdeps/x86_64/fpu/math-tests-arch.h
@@ -16,11 +16,11 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <cpu-features.h>
-
 #if defined REQUIRE_AVX
+# include <init-arch.h>
 
 # define INIT_ARCH_EXT
+
 # define CHECK_ARCH_EXT                                        \
   do                                                           \
     {                                                          \
@@ -29,8 +29,10 @@
   while (0)
 
 #elif defined REQUIRE_AVX2
+# include <init-arch.h>
 
 # define INIT_ARCH_EXT
+
 # define CHECK_ARCH_EXT                                        \
   do                                                           \
     {                                                          \
@@ -39,8 +41,10 @@
   while (0)
 
 #elif defined REQUIRE_AVX512F
+# include <init-arch.h>
 
 # define INIT_ARCH_EXT
+
 # define CHECK_ARCH_EXT                                        \
   do                                                           \
     {                                                          \
diff --git a/sysdeps/x86_64/multiarch/test-multiarch.c b/sysdeps/x86_64/multiarch/test-multiarch.c
index 597d64e..3974842 100644
--- a/sysdeps/x86_64/multiarch/test-multiarch.c
+++ b/sysdeps/x86_64/multiarch/test-multiarch.c
@@ -16,7 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <cpu-features.h>
+#include <init-arch.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>