From owner-svn-src-projects@freebsd.org Sun Oct 22 21:34:38 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7775E36960 for ; Sun, 22 Oct 2017 21:34:38 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A4F8975A0E; Sun, 22 Oct 2017 21:34:38 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MLYboH072149; Sun, 22 Oct 2017 21:34:37 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MLYbfE072147; Sun, 22 Oct 2017 21:34:37 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201710222134.v9MLYbfE072147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sun, 22 Oct 2017 21:34:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324873 - in projects/runtime-coverage: lib/libclang_rt share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/runtime-coverage: lib/libclang_rt share/mk X-SVN-Commit-Revision: 324873 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Oct 2017 21:34:39 -0000 Author: ngie Date: Sun Oct 22 21:34:37 2017 New Revision: 324873 URL: https://svnweb.freebsd.org/changeset/base/324873 Log: Define TARGET_CPUARCH and use in libclang_rt as the basis for CRTARCH When cross-compiling, the wrong architecture was being embedded in the libclang_rt binary filenames. It should be based on TARGET_ARCH (target), not MACHINE_ARCH (host). This is a draft commit against my project branch. Will fix on ^/head soon. PR: 222925 Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc projects/runtime-coverage/share/mk/sys.mk Modified: projects/runtime-coverage/lib/libclang_rt/Makefile.inc ============================================================================== --- projects/runtime-coverage/lib/libclang_rt/Makefile.inc Sun Oct 22 21:11:59 2017 (r324872) +++ projects/runtime-coverage/lib/libclang_rt/Makefile.inc Sun Oct 22 21:34:37 2017 (r324873) @@ -2,7 +2,7 @@ .include -CRTARCH= ${MACHINE_CPUARCH:C/amd64/x86_64/} +CRTARCH= ${TARGET_CPUARCH:C/amd64/x86_64/} CRTSRC= ${SRCTOP}/contrib/compiler-rt .PATH: ${CRTSRC}/lib Modified: projects/runtime-coverage/share/mk/sys.mk ============================================================================== --- projects/runtime-coverage/share/mk/sys.mk Sun Oct 22 21:11:59 2017 (r324872) +++ projects/runtime-coverage/share/mk/sys.mk Sun Oct 22 21:34:37 2017 (r324873) @@ -15,6 +15,7 @@ unix ?= We run FreeBSD, not UNIX. # __TO_CPUARCH=C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v[67])?(eb)?/arm/:C/powerpc(64|spe)/powerpc/:C/riscv64(sf)?/riscv/ MACHINE_CPUARCH=${MACHINE_ARCH:${__TO_CPUARCH}} +TARGET_CPUARCH=${TARGET_ARCH:${__TO_CPUARCH}} .endif