From owner-svn-src-all@freebsd.org Mon Oct 14 21:22:43 2019 Return-Path: Delivered-To: svn-src-all@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 5BD09140797; Mon, 14 Oct 2019 21:22:43 +0000 (UTC) (envelope-from jhb@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 46sWjv1k2Hz3RGS; Mon, 14 Oct 2019 21:22:43 +0000 (UTC) (envelope-from jhb@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 1FCDEB3B6; Mon, 14 Oct 2019 21:22:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9ELMgpQ006104; Mon, 14 Oct 2019 21:22:42 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9ELMgNj006103; Mon, 14 Oct 2019 21:22:42 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201910142122.x9ELMgNj006103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 14 Oct 2019 21:22:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353523 - head X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 353523 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 14 Oct 2019 21:22:43 -0000 Author: jhb Date: Mon Oct 14 21:22:42 2019 New Revision: 353523 URL: https://svnweb.freebsd.org/changeset/base/353523 Log: Disconnect powerpc from the default tinderbox for now. The wrong toolchain was set in MAKE_PARAMS_powerpc, however, there are some other issues preventing powerpc from building in tinderbox: 1) There is no powerpc-gcc and powerpc-xtoolchain-gcc port that provides an external 32-bit powerpc GCC toolchain. 2) On other targets, the same toolchain can build all of the architectures for a given target. MIPS achieves this by always setting -mabi and -EB/-EL explicitly instead of relying on the compiler's default architecture. PowerPC might be able to do the same thing, but as of today, powerpc-gcc would be required for powerpc and powerpcspe and powerpc64-gcc would be required for powerpc64. Our existing logic for make universe does not permit per-MACHINE_ARCH toolchains. I tried hacking TARGETS_powerpc to only include powerpc64 when powerpc64-gcc was present, and while that skipped the 32-bit worlds, it tried to build all the kernels. Reported by: jeff Discussed with: imp Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Mon Oct 14 21:18:37 2019 (r353522) +++ head/Makefile Mon Oct 14 21:22:42 2019 (r353523) @@ -485,12 +485,15 @@ worlds: .PHONY .if make(universe) || make(universe_kernels) || make(tinderbox) || \ make(targets) || make(universe-toolchain) # -# By default, build only the known-good clang-supporting platforms. -# If MAKE_OBSOLETE_GCC is defined, built all the old GCC architectures. +# Always build architectures supported by clang. Only build architectures +# only supported by GCC if a suitable toolchain is present or enabled. # In all cases, if the user specifies TARGETS on the command line, # honor that most of all. # -_OBSOLETE_GCC_TARGETS=mips powerpc sparc64 +_OBSOLETE_GCC_TARGETS=mips sparc64 +.if defined(MAKE_OBSOLETE_GCC) +_OBSOLETE_GCC_TARGETS+=powerpc +.endif TARGETS?=amd64 arm arm64 i386 riscv ${_OBSOLETE_GCC_TARGETS} _UNIVERSE_TARGETS= ${TARGETS} TARGET_ARCHES_arm?= arm armv6 armv7 @@ -507,7 +510,7 @@ MAKE_PARAMS_riscv?= CROSS_TOOLCHAIN=riscv64-gcc .if !defined(MAKE_OBSOLETE_GCC) OBSOLETE_GCC_TARGETS=${_OBSOLETE_GCC_TARGETS} MAKE_PARAMS_mips?= CROSS_TOOLCHAIN=mips-gcc -MAKE_PARAMS_powerpc?= CROSS_TOOLCHAIN=powerpc-gcc +MAKE_PARAMS_powerpc?= CROSS_TOOLCHAIN=powerpc64-gcc MAKE_PARAMS_sparc64?= CROSS_TOOLCHAIN=sparc64-gcc .endif