From owner-svn-src-all@FreeBSD.ORG Tue Oct 18 10:44:57 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96D09106566C; Tue, 18 Oct 2011 10:44:57 +0000 (UTC) (envelope-from nalitoja@gmail.com) Received: from mail-wy0-f182.google.com (mail-wy0-f182.google.com [74.125.82.182]) by mx1.freebsd.org (Postfix) with ESMTP id A8DD98FC18; Tue, 18 Oct 2011 10:44:56 +0000 (UTC) Received: by wyi40 with SMTP id 40so544733wyi.13 for ; Tue, 18 Oct 2011 03:44:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mime-version:content-type; bh=KN/LZJbJkyA8b+8z3DG8jcl87hcR76y+KhwiI7C8+eU=; b=gqWY1AJNiSStGBgkyGcPK2yC9EB/H7JrtQ8jte9zhdiq1ZMz4Jglu1/U0WS9hFQxMT GC4xTDuz3i+GOukigY9f7uAiCRFFumUFhAEHZyPPOSG/HcmG9hmBdQJptYUB+40XfCXn aAoTTFY6dBBjblBdjIs8mmCnFhBKimEvSwzL8= Received: by 10.216.229.219 with SMTP id h69mr484702weq.1.1318934695292; Tue, 18 Oct 2011 03:44:55 -0700 (PDT) Received: from nil (exit-01d.noisetor.net. [173.254.216.69]) by mx.google.com with ESMTPS id ek13sm2757649wbb.3.2011.10.18.03.44.24 (version=SSLv3 cipher=OTHER); Tue, 18 Oct 2011 03:44:53 -0700 (PDT) From: Nali Toja To: Dimitry Andric In-Reply-To: <86y5wjktea.fsf@gmail.com> (Nali Toja's message of "Tue, 18 Oct 2011 00:58:21 +0000") Date: Tue, 18 Oct 2011 10:43:44 +0000 Message-ID: <8662jmo9zz.fsf@gmail.com> References: <201110171830.p9HIUIiR035423__37008.086537435$1318876298$gmane$org@svn.freebsd.org> <86y5wjktea.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.90 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r226475 - head/lib/clang X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Oct 2011 10:44:57 -0000 Nali Toja writes: >> Log: >> Update llvm/clang's target triple (confusingly named LLVM_HOSTTRIPLE) to >> $arch-unknown-freebsd10.0. >> >> Modified: >> head/lib/clang/clang.build.mk >> >> Modified: head/lib/clang/clang.build.mk >> ============================================================================== >> --- head/lib/clang/clang.build.mk Mon Oct 17 15:54:20 2011 (r226474) >> +++ head/lib/clang/clang.build.mk Mon Oct 17 18:30:18 2011 (r226475) >> @@ -14,8 +14,7 @@ CFLAGS+= -O1 >> .endif >> >> TARGET_ARCH?= ${MACHINE_ARCH} >> -# XXX: 8.0, to keep __FreeBSD_cc_version happy >> -CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH:C/amd64/x86_64/}-unknown-freebsd9.0\" >> +CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0\" > > I think this results in __FreeBSD__ macro being defined as `1' and > subsequently breaking clangworld where its value is used, e.g. And it builds successfully with the following bandaid. Index: contrib/llvm/tools/clang/lib/Basic/Targets.cpp =================================================================== --- contrib/llvm/tools/clang/lib/Basic/Targets.cpp (revision 226484) +++ contrib/llvm/tools/clang/lib/Basic/Targets.cpp (working copy) @@ -239,7 +239,7 @@ class FreeBSDTargetInfo : public OSTargetInfo