From owner-svn-src-projects@freebsd.org Fri Sep 13 21:03:43 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F3C03D3449 for ; Fri, 13 Sep 2019 21:03:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46VSmH69W7z47c6; Fri, 13 Sep 2019 21:03:43 +0000 (UTC) (envelope-from dim@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9EDD1D417; Fri, 13 Sep 2019 21:03:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8DL3hc1055149; Fri, 13 Sep 2019 21:03:43 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8DL3hmb055148; Fri, 13 Sep 2019 21:03:43 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201909132103.x8DL3hmb055148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Fri, 13 Sep 2019 21:03:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r352307 - projects/clang900-import/lib/libclang_rt X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: projects/clang900-import/lib/libclang_rt X-SVN-Commit-Revision: 352307 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.29 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: Fri, 13 Sep 2019 21:03:44 -0000 Author: dim Date: Fri Sep 13 21:03:43 2019 New Revision: 352307 URL: https://svnweb.freebsd.org/changeset/base/352307 Log: Rearrange libclang_rt Makefile again, and attempt to simplify it. It turns out that parts of the common sanitizer code still do not compile for arm and aarch64, at least not on FreeBSD, so for now those are all limited to amd64, and sometimes i386. Modified: projects/clang900-import/lib/libclang_rt/Makefile Modified: projects/clang900-import/lib/libclang_rt/Makefile ============================================================================== --- projects/clang900-import/lib/libclang_rt/Makefile Fri Sep 13 21:00:19 2019 (r352306) +++ projects/clang900-import/lib/libclang_rt/Makefile Fri Sep 13 21:03:43 2019 (r352307) @@ -1,47 +1,35 @@ # $FreeBSD$ -SUBDIR_ALL+= include -SUBDIR_ALL+= profile -SUBDIR_ALL+= stats -SUBDIR_ALL+= stats_client -SUBDIR_ALL+= ubsan_minimal -SUBDIR_ALL+= ubsan_standalone -SUBDIR_ALL+= ubsan_standalone_cxx +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +SUBDIR+= include +SUBDIR+= asan +SUBDIR+= asan-preinit +SUBDIR+= asan_cxx +SUBDIR+= asan_dynamic +SUBDIR+= cfi +SUBDIR+= cfi_diag +SUBDIR+= safestack +SUBDIR+= stats +SUBDIR+= stats_client +SUBDIR+= ubsan_minimal +SUBDIR+= ubsan_standalone +SUBDIR+= ubsan_standalone_cxx +.endif # amd64 || i386 -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386" -SUBDIR_ALL+= asan -SUBDIR_ALL+= asan-preinit -SUBDIR_ALL+= asan_cxx -SUBDIR_ALL+= asan_dynamic -SUBDIR_ALL+= cfi -SUBDIR_ALL+= cfi_diag -.endif # aarch64 || amd64 || arm || i386 +.if ${MACHINE_CPUARCH} == "amd64" +SUBDIR+= dd +SUBDIR+= fuzzer +SUBDIR+= fuzzer_no_main +SUBDIR+= msan +SUBDIR+= msan_cxx +SUBDIR+= tsan +SUBDIR+= tsan_cxx +SUBDIR+= xray +SUBDIR+= xray-basic +SUBDIR+= xray-fdr +SUBDIR+= xray-profiling +.endif # amd64 -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" -SUBDIR_ALL+= dd -SUBDIR_ALL+= fuzzer -SUBDIR_ALL+= fuzzer_no_main -SUBDIR_ALL+= msan -SUBDIR_ALL+= msan_cxx -SUBDIR_ALL+= tsan -SUBDIR_ALL+= tsan_cxx -.endif # aarch64 || amd64 +SUBDIR+= profile -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "i386" -SUBDIR_ALL+= safestack -.endif # aarch64 || amd64 || i386 - -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" -SUBDIR_ALL+= xray -SUBDIR_ALL+= xray-basic -SUBDIR_ALL+= xray-fdr -SUBDIR_ALL+= xray-profiling -.endif # aarch64 || amd64 || arm - -SUBDIR+= ${SUBDIR_ALL:O} - .include -# DO NOT DELETE