From owner-svn-src-all@FreeBSD.ORG Tue Oct 18 01:22:19 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 47A09106564A; Tue, 18 Oct 2011 01:22:19 +0000 (UTC) (envelope-from nalitoja@gmail.com) Received: from mail-ey0-f182.google.com (mail-ey0-f182.google.com [209.85.215.182]) by mx1.freebsd.org (Postfix) with ESMTP id 116428FC0A; Tue, 18 Oct 2011 01:22:17 +0000 (UTC) Received: by eyd10 with SMTP id 10so86940eyd.13 for ; Mon, 17 Oct 2011 18:22:16 -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=rS0N74ilG4YiGwR9eqBQIMVoBNWdcjiYmbku8fsLb9A=; b=uxt119XFVxx19n/LDtkTS+aoSqmuCtmvAP53RmSsNSMm2MjlErFchqF2wGl7gLmy+Y 3ByAZrmdroEGLJG85Yim2zUIYKfpgRRN1V2ArvFwXKMYNN2dcMBSTkI9DX8S45DcOEbU U2/5juCRi4tZeVPuVcInI+xasavPsxOHfAe/0= Received: by 10.223.7.18 with SMTP id b18mr304526fab.31.1318899525805; Mon, 17 Oct 2011 17:58:45 -0700 (PDT) Received: from nil (politkovskaja.torservers.net. [77.247.181.165]) by mx.google.com with ESMTPS id l8sm523214fai.16.2011.10.17.17.58.43 (version=SSLv3 cipher=OTHER); Mon, 17 Oct 2011 17:58:45 -0700 (PDT) From: Nali Toja To: Dimitry Andric In-Reply-To: <201110171830.p9HIUIiR035423__37008.086537435$1318876298$gmane$org@svn.freebsd.org> (Dimitry Andric's message of "Mon, 17 Oct 2011 18:30:18 +0000 (UTC)") Date: Tue, 18 Oct 2011 00:58:21 +0000 Message-ID: <86y5wjktea.fsf@gmail.com> References: <201110171830.p9HIUIiR035423__37008.086537435$1318876298$gmane$org@svn.freebsd.org> 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 01:22:19 -0000 Dimitry Andric 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. ===> lib/libarchive (all) In file included from /src/lib/libarchive/archive_check_magic.c:26: In file included from /src/lib/libarchive/archive_platform.h:81: In file included from /obj/src/tmp/usr/include/inttypes.h:33: /obj/src/tmp/usr/include/sys/stdint.h:59:21: error: redefinition of typedef 'int64_t' is invalid in C [-Wtypedef- redefinition] typedef __intmax_t intmax_t; ^ /src/lib/libarchive/config_freebsd.h:166:18: note: expanded from: #define intmax_t int64_t ^ /obj/src/tmp/usr/include/sys/_stdint.h:49:20: note: previous definition is here typedef __int64_t int64_t;