From owner-svn-src-head@freebsd.org Tue Mar 28 07:58:28 2017 Return-Path: Delivered-To: svn-src-head@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 CE194D20AFA; Tue, 28 Mar 2017 07:58:28 +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 mx1.freebsd.org (Postfix) with ESMTPS id 9DB51E6C; Tue, 28 Mar 2017 07:58:28 +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 v2S7wRNS053276; Tue, 28 Mar 2017 07:58:27 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2S7wR78053275; Tue, 28 Mar 2017 07:58:27 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703280758.v2S7wR78053275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 28 Mar 2017 07:58:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316079 - head/sys/boot/i386/boot2 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2017 07:58:28 -0000 Author: imp Date: Tue Mar 28 07:58:27 2017 New Revision: 316079 URL: https://svnweb.freebsd.org/changeset/base/316079 Log: Simply retire the sedification of the boot2.s file. It's been obsolete for years. clang before 96 free after 100 (+4) gcc before 163 free after 156 (-7) Suggested by: bde@ Sponsored by: Netflix Modified: head/sys/boot/i386/boot2/Makefile Modified: head/sys/boot/i386/boot2/Makefile ============================================================================== --- head/sys/boot/i386/boot2/Makefile Tue Mar 28 07:10:35 2017 (r316078) +++ head/sys/boot/i386/boot2/Makefile Tue Mar 28 07:58:27 2017 (r316079) @@ -66,7 +66,7 @@ boot1.out: boot1.o ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ - boot2.s boot2.s.tmp boot2.h sio.o + boot2.h sio.o boot2: boot2.ld @set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \ @@ -86,24 +86,8 @@ boot2.bin: boot2.out boot2.out: ${BTXCRT} boot2.o sio.o ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} -boot2.o: boot2.s - ${CC} ${ACFLAGS} -c boot2.s - SRCS= boot2.c boot2.h -# Gcc (4.2.1 at least) benefits from removing the forced alignment -# clang doesn't. Make the removal as specific as possible to avoid -# false positives (like path names with odd names for debugging info). -# In the past, gcc benefited from nop removal, but not in 4.2.1. -# Think of this as a poor-man's peephole optimizer for gcc 4.2.1 -boot2.s: boot2.c boot2.h ${.CURDIR}/../../common/ufsread.c - ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.CURDIR}/boot2.c -.if ${COMPILER_TYPE} == "gcc" - sed -e '/\.align 4/d' < boot2.s.tmp > boot2.s -.else - cp boot2.s.tmp boot2.s -.endif - boot2.h: boot1.out ${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \ { x = $$1 - ORG1; \