From owner-svn-src-head@freebsd.org Mon Oct 3 14:18:14 2016 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 D3752AF376C; Mon, 3 Oct 2016 14:18:14 +0000 (UTC) (envelope-from andrew@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 8C708E65; Mon, 3 Oct 2016 14:18:14 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u93EID0M047299; Mon, 3 Oct 2016 14:18:13 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u93EID4W047298; Mon, 3 Oct 2016 14:18:13 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201610031418.u93EID4W047298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Mon, 3 Oct 2016 14:18:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r306639 - head/sys/conf 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: Mon, 03 Oct 2016 14:18:14 -0000 Author: andrew Date: Mon Oct 3 14:18:13 2016 New Revision: 306639 URL: https://svnweb.freebsd.org/changeset/base/306639 Log: Split the compiler command line for building the arm elf trampoline code so common parts of the command are on separate lines. Sponsored by: ABT Systems Ltd Modified: head/sys/conf/Makefile.arm Modified: head/sys/conf/Makefile.arm ============================================================================== --- head/sys/conf/Makefile.arm Mon Oct 3 14:07:15 2016 (r306638) +++ head/sys/conf/Makefile.arm Mon Oct 3 14:18:13 2016 (r306639) @@ -90,13 +90,20 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$ -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp eval $$(stat -s ${KERNEL_KO}.tmp) && \ echo "#define KERNSIZE $$st_size" >>opt_kernname.h - ${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker ldscript.$M.tramp \ - tmphack.S $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \ - ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp - ${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker \ - ldscript.$M.tramp.noheader \ - tmphack.S $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \ - ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp.noheader + ${CC} -O -nostdlib -I. -I$S \ + -Xlinker -T -Xlinker ldscript.$M.tramp \ + tmphack.S \ + $S/$M/$M/elf_trampoline.c \ + $S/$M/$M/inckern.S \ + ${FILES_CPU_FUNC} \ + -o ${KERNEL_KO}.tramp + ${CC} -O -nostdlib -I. -I$S \ + -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \ + tmphack.S \ + $S/$M/$M/elf_trampoline.c \ + $S/$M/$M/inckern.S \ + ${FILES_CPU_FUNC} \ + -o ${KERNEL_KO}.tramp.noheader ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \ ${KERNEL_KO}.tramp.bin ${OBJCOPY} ${STRIP_FLAGS} ${KERNEL_KO}.tmp @@ -106,15 +113,28 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$ gzip -f9 ${KERNEL_KO}.tmp eval $$(stat -s ${KERNEL_KO}.tmp.gz) && \ echo "#define KERNCOMPSIZE $$st_size" >>opt_kernname.h - ${CC} -O2 -ffreestanding -DKZIP -I. -I$S -c $S/kern/inflate.c -o \ - inflate-tramp.o - ${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker ldscript.$M.tramp \ - -DKZIP tmphack.S $S/$M/$M/elf_trampoline.c inflate-tramp.o \ - $S/$M/$M/inckern.S ${FILES_CPU_FUNC} -o ${KERNEL_KO}.gz.tramp - ${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker \ - ldscript.$M.tramp.noheader \ - -DKZIP tmphack.S $S/$M/$M/elf_trampoline.c inflate-tramp.o \ - $S/$M/$M/inckern.S ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp.noheader + ${CC} -O2 -ffreestanding -I. -I$S -c \ + -DKZIP \ + $S/kern/inflate.c \ + -o inflate-tramp.o + ${CC} -O -nostdlib -I. -I$S \ + -Xlinker -T -Xlinker ldscript.$M.tramp \ + -DKZIP \ + tmphack.S \ + $S/$M/$M/elf_trampoline.c \ + inflate-tramp.o \ + $S/$M/$M/inckern.S \ + ${FILES_CPU_FUNC} \ + -o ${KERNEL_KO}.gz.tramp + ${CC} -O -nostdlib -I. -I$S \ + -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \ + -DKZIP \ + tmphack.S \ + $S/$M/$M/elf_trampoline.c \ + inflate-tramp.o \ + $S/$M/$M/inckern.S \ + ${FILES_CPU_FUNC} \ + -o ${KERNEL_KO}.tramp.noheader ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \ ${KERNEL_KO}.gz.tramp.bin rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \