From owner-svn-src-head@FreeBSD.ORG  Sat Jul 13 13:04:39 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0CFD3BA4;
 Sat, 13 Jul 2013 13:04:39 +0000 (UTC)
 (envelope-from theraven@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F3ECD1FC0;
 Sat, 13 Jul 2013 13:04:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6DD4cOC029379;
 Sat, 13 Jul 2013 13:04:38 GMT
 (envelope-from theraven@svn.freebsd.org)
Received: (from theraven@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6DD4cwC029378;
 Sat, 13 Jul 2013 13:04:38 GMT
 (envelope-from theraven@svn.freebsd.org)
Message-Id: <201307131304.r6DD4cwC029378@svn.freebsd.org>
From: David Chisnall <theraven@FreeBSD.org>
Date: Sat, 13 Jul 2013 13:04:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253321 - head/lib/msun/src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jul 2013 13:04:39 -0000

Author: theraven
Date: Sat Jul 13 13:04:38 2013
New Revision: 253321
URL: http://svnweb.freebsd.org/changeset/base/253321

Log:
  Cleaner support for type qualifiers.
  
  Submitted by:	Pasi Parviainen

Modified:
  head/lib/msun/src/math.h

Modified: head/lib/msun/src/math.h
==============================================================================
--- head/lib/msun/src/math.h	Sat Jul 13 10:47:17 2013	(r253320)
+++ head/lib/msun/src/math.h	Sat Jul 13 13:04:38 2013	(r253321)
@@ -83,19 +83,10 @@ extern const union __nan_un {
 
 #if (__STDC_VERSION__ >= 201112L && defined(__clang__)) || \
     __has_extension(c_generic_selections)
-#define	__fp_type_select(x, f, d, ld) _Generic((x),			\
+#define	__fp_type_select(x, f, d, ld) _Generic((0,(x)),			\
     float: f(x),							\
     double: d(x),							\
-    long double: ld(x),							\
-    volatile float: f(x),						\
-    volatile double: d(x),						\
-    volatile long double: ld(x),					\
-    volatile const float: f(x),						\
-    volatile const double: d(x),					\
-    volatile const long double: ld(x),					\
-    const float: f(x),							\
-    const double: d(x),							\
-    const long double: ld(x))
+    long double: ld(x))
 #elif __GNUC_PREREQ__(3, 1) && !defined(__cplusplus)
 #define	__fp_type_select(x, f, d, ld) __builtin_choose_expr(		\
     __builtin_types_compatible_p(__typeof(x), long double), ld(x),	\