From db7a548d02a9a47e8592d67980ffd1faeab3e20f Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Thu, 22 Jun 2017 22:53:01 +0000
Subject: Make float128_private.h work with generic ieee754.h.

float128_private.h redefines ieee754.h identifiers ieee854_long_double
and IEEE854_LONG_DOUBLE_BIAS to map them to identifiers from
ieee754_float128.h.

This causes problems when ieee754.h is included after
float128_private.h and it's a version of ieee754.h that also defines
those identifiers; specifically, sysdeps/ieee754/ieee754.h, which
defines those identifiers for the x86 extended format.  This patch
fixes this by ensuring an include of ieee754.h from float128_private.h
before the redefinitions.

Tested for x86_64 (in conjunction with float128 patches).

	* sysdeps/ieee754/float128/float128_private.h: Include
	<ieee754.h>.
---
 sysdeps/ieee754/float128/float128_private.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sysdeps/ieee754')

diff --git a/sysdeps/ieee754/float128/float128_private.h b/sysdeps/ieee754/float128/float128_private.h
index 1e00853c83..c8b153d0c1 100644
--- a/sysdeps/ieee754/float128/float128_private.h
+++ b/sysdeps/ieee754/float128/float128_private.h
@@ -23,6 +23,10 @@
 #define HUGE_VALL HUGE_VAL_F128
 #include <math/mul_splitl.h>
 
+/* This must be included before the renames of types and macros from
+   it.  */
+#include <ieee754.h>
+
 /* Renames derived from math_private.h.  */
 #include <math_private.h>
 #include <ieee754_float128.h>
-- 
cgit 1.4.1