From owner-svn-src-all@freebsd.org Fri Jul 20 05:18:00 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F5661030D32; Fri, 20 Jul 2018 05:18:00 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8DB388D14A; Fri, 20 Jul 2018 05:17:58 +0000 (UTC) (envelope-from imp@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 00B3A3CC8; Fri, 20 Jul 2018 05:17:57 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6K5HvYG017925; Fri, 20 Jul 2018 05:17:57 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6K5HuYd017918; Fri, 20 Jul 2018 05:17:56 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807200517.w6K5HuYd017918@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 20 Jul 2018 05:17:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336534 - in head/stand: efi/boot1 efi/loader i386/boot2 i386/gptboot i386/gptzfsboot i386/isoboot i386/zfsboot X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/stand: efi/boot1 efi/loader i386/boot2 i386/gptboot i386/gptzfsboot i386/isoboot i386/zfsboot X-SVN-Commit-Revision: 336534 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.27 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: Fri, 20 Jul 2018 05:18:00 -0000 Author: imp Date: Fri Jul 20 05:17:56 2018 New Revision: 336534 URL: https://svnweb.freebsd.org/changeset/base/336534 Log: NM and OBJCOPY are already defined for all builds. There's no need to conditionally define them here. Modified: head/stand/efi/boot1/Makefile head/stand/efi/loader/Makefile head/stand/i386/boot2/Makefile head/stand/i386/gptboot/Makefile head/stand/i386/gptzfsboot/Makefile head/stand/i386/isoboot/Makefile head/stand/i386/zfsboot/Makefile Modified: head/stand/efi/boot1/Makefile ============================================================================== --- head/stand/efi/boot1/Makefile Fri Jul 20 05:17:49 2018 (r336533) +++ head/stand/efi/boot1/Makefile Fri Jul 20 05:17:56 2018 (r336534) @@ -76,9 +76,6 @@ LDADD+= ${LIBEFI} ${LIBSA} DPADD+= ${LDSCRIPT} -NM?= nm -OBJCOPY?= objcopy - .if ${MACHINE_CPUARCH} == "amd64" EFI_TARGET= efi-app-x86_64 .elif ${MACHINE_CPUARCH} == "i386" Modified: head/stand/efi/loader/Makefile ============================================================================== --- head/stand/efi/loader/Makefile Fri Jul 20 05:17:49 2018 (r336533) +++ head/stand/efi/loader/Makefile Fri Jul 20 05:17:56 2018 (r336534) @@ -91,9 +91,6 @@ CLEANFILES+= loader.efi NEWVERSWHAT= "EFI loader" ${MACHINE} -NM?= nm -OBJCOPY?= objcopy - .if ${MACHINE_CPUARCH} == "amd64" EFI_TARGET= efi-app-x86_64 .elif ${MACHINE_CPUARCH} == "i386" Modified: head/stand/i386/boot2/Makefile ============================================================================== --- head/stand/i386/boot2/Makefile Fri Jul 20 05:17:49 2018 (r336533) +++ head/stand/i386/boot2/Makefile Fri Jul 20 05:17:56 2018 (r336534) @@ -4,8 +4,6 @@ FILES= boot boot1 boot2 -NM?= nm - # A value of 0x80 enables LBA support. BOOT_BOOT1_FLAGS?= 0x80 Modified: head/stand/i386/gptboot/Makefile ============================================================================== --- head/stand/i386/gptboot/Makefile Fri Jul 20 05:17:49 2018 (r336533) +++ head/stand/i386/gptboot/Makefile Fri Jul 20 05:17:56 2018 (r336534) @@ -7,8 +7,6 @@ FILES= gptboot MAN= gptboot.8 -NM?= nm - BOOT_COMCONSOLE_PORT?= 0x3f8 BOOT_COMCONSOLE_SPEED?= 9600 B2SIOFMT?= 0x3 Modified: head/stand/i386/gptzfsboot/Makefile ============================================================================== --- head/stand/i386/gptzfsboot/Makefile Fri Jul 20 05:17:49 2018 (r336533) +++ head/stand/i386/gptzfsboot/Makefile Fri Jul 20 05:17:56 2018 (r336534) @@ -9,8 +9,6 @@ FILES= gptzfsboot MAN= gptzfsboot.8 -NM?= nm - BOOT_COMCONSOLE_PORT?= 0x3f8 BOOT_COMCONSOLE_SPEED?= 9600 B2SIOFMT?= 0x3 Modified: head/stand/i386/isoboot/Makefile ============================================================================== --- head/stand/i386/isoboot/Makefile Fri Jul 20 05:17:49 2018 (r336533) +++ head/stand/i386/isoboot/Makefile Fri Jul 20 05:17:56 2018 (r336534) @@ -8,8 +8,6 @@ FILES= isoboot MAN= isoboot.8 -NM?= nm - BOOT_COMCONSOLE_PORT?= 0x3f8 BOOT_COMCONSOLE_SPEED?= 9600 B2SIOFMT?= 0x3 Modified: head/stand/i386/zfsboot/Makefile ============================================================================== --- head/stand/i386/zfsboot/Makefile Fri Jul 20 05:17:49 2018 (r336533) +++ head/stand/i386/zfsboot/Makefile Fri Jul 20 05:17:56 2018 (r336534) @@ -7,8 +7,6 @@ FILES= zfsboot MAN= zfsboot.8 -NM?= nm - BOOT_COMCONSOLE_PORT?= 0x3f8 BOOT_COMCONSOLE_SPEED?= 9600 B2SIOFMT?= 0x3