From owner-svn-src-user@FreeBSD.ORG  Tue Dec 25 16:44:50 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B5EF1C2B;
 Tue, 25 Dec 2012 16:44:50 +0000 (UTC)
 (envelope-from attilio@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 99F3A8FC12;
 Tue, 25 Dec 2012 16:44:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBPGiod9091480;
 Tue, 25 Dec 2012 16:44:50 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBPGiobA091479;
 Tue, 25 Dec 2012 16:44:50 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201212251644.qBPGiobA091479@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 25 Dec 2012 16:44:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r244685 - user/attilio/membarclean/sys
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Dec 2012 16:44:50 -0000

Author: attilio
Date: Tue Dec 25 16:44:50 2012
New Revision: 244685
URL: http://svnweb.freebsd.org/changeset/base/244685

Log:
  Fix up the bultin detection for the time being.

Modified:
  user/attilio/membarclean/sys/cdefs.h

Modified: user/attilio/membarclean/sys/cdefs.h
==============================================================================
--- user/attilio/membarclean/sys/cdefs.h	Tue Dec 25 16:36:38 2012	(r244684)
+++ user/attilio/membarclean/sys/cdefs.h	Tue Dec 25 16:44:50 2012	(r244685)
@@ -229,9 +229,7 @@
 #define	__alignof(x)	__offsetof(struct { char __a; x __b; }, __b)
 #endif
 
-#if defined(__GNUC__) && 						\
-    ((defined(__clang__) && __has_builtin(__builtin_prefetch)) ||	\
-    __GNUC_PREREQ__(3, 0))
+#if defined(__GNUC__) && __GNUC_PREREQ__(3, 0)
 #define	PRFTCH_RD	0
 #define	PRFTCH_WR	1