From owner-svn-src-stable-10@freebsd.org Fri Jan 15 02:15:48 2016 Return-Path: Delivered-To: svn-src-stable-10@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 68DDBA82357 for ; Fri, 15 Jan 2016 02:15:48 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ECC8611BE for ; Fri, 15 Jan 2016 02:15:47 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: by mail-wm0-x232.google.com with SMTP id u188so5981313wmu.1 for ; Thu, 14 Jan 2016 18:15:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=9fagehP63ev0U2WKqCnAQUCkQDDHqpjnjpfuLv3X5V8=; b=ga1yvgcLrA7jiWzpM1+9F+t1khdtX1ho5bCSyzB8EQhWbhoF1VsGuYHdUSrJGvzB8x EGoWpHu+vJGrGeApMhiFvhPdsFdG6Q+ocS4Qajlyg4HDWF6MsCtsZZyCyBh1cbnYggfr WZyLsCVQl4ywc9kIHRr2iceQJ9Gm8dtQPoR/RV9LrJY/UWIC+bdufG8C4jS0/yOdz2bj YPCdB5H7gCh0CWVdOvKbu6BI+tbp/ROtYQAcDVOpOCkvaOHU36f+l1grrNhyq0aPSobs rUNZGY/qk8kj/fYakyQopj1wYCf8Sw4LZY31WRWlNcN5/hQ6GyITpeNGZfxoMA8PHhXm oU+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=9fagehP63ev0U2WKqCnAQUCkQDDHqpjnjpfuLv3X5V8=; b=cwaBj0TVLzwUqpBoj2V3Oe3SfdhiX44eAKPFvS5pIb7n54FDHRdUcarW8Zf7EL0NpG /uZ4y6dILEwuMNfy+7cHKY1FWnIg/5qmOFnZ8n3wgN2Pz2nLqVR3PD/BADtxxP6y+zKF b0LsICoouH1raoI0lsFAo+brYIi/6seLE1VZG5TbmsBPcdYUvMqro0TvWFWdikkg8z3L DK5Mqm1wJyhJaUsNv9hPA08Osh6kvLQkpQ7svfM+J/JI2vveEVIZqGwT3K5wUj7Dmr0A t1NcDdVW28c2xHqkmWHyqeKoX3+JJad0MQ6qGYqGYIHBLzf49xJEq/5uFWpX/0hSby0o xMoQ== X-Gm-Message-State: ALoCoQkV31KoD1tFCSrJngYy2lYhXplOsCmbknfS1bJQCXZP8DCF7xyT5mpyXiR2QbpUfFGy3BRsb21ecoIoJtWktPacsqmWzQ== X-Received: by 10.194.112.41 with SMTP id in9mr7126218wjb.139.1452824146256; Thu, 14 Jan 2016 18:15:46 -0800 (PST) Received: from [10.10.1.58] (liv3d.labs.multiplay.co.uk. [82.69.141.171]) by smtp.gmail.com with ESMTPSA id z127sm401461wme.2.2016.01.14.18.15.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 18:15:44 -0800 (PST) Subject: Re: svn commit: r293297 - in stable/10/sys/boot/efi: . boot1 loader loader/arch loader/arch/amd64 To: Oliver Pinter , Ed Maste References: <201601070222.u072MjTs098126@repo.freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org From: Steven Hartland Message-ID: <56985664.50702@multiplay.co.uk> Date: Fri, 15 Jan 2016 02:16:04 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jan 2016 02:15:48 -0000 This is fixed by 294064 MFC of r274503 On 15/01/2016 01:02, Oliver Pinter wrote: > On 1/7/16, Ed Maste wrote: >> Author: emaste >> Date: Thu Jan 7 02:22:45 2016 >> New Revision: 293297 >> URL: https://svnweb.freebsd.org/changeset/base/293297 >> >> Log: >> MFC r280950: Move the efi loaders to be under sys/boot/efi >> >> In HEAD this was done to support UEFI on arm64. Merging to stable/10 to >> facilitate the merging of later UEFI changes. >> >> Added: >> stable/10/sys/boot/efi/boot1/ >> stable/10/sys/boot/efi/boot1/Makefile (contents, props changed) >> stable/10/sys/boot/efi/boot1/Makefile.fat (contents, props changed) >> stable/10/sys/boot/efi/boot1/boot1.c (contents, props changed) >> stable/10/sys/boot/efi/boot1/fat.tmpl.bz2.uu (contents, props changed) >> stable/10/sys/boot/efi/boot1/generate-fat.sh (contents, props changed) >> stable/10/sys/boot/efi/loader/ >> stable/10/sys/boot/efi/loader/Makefile (contents, props changed) >> stable/10/sys/boot/efi/loader/arch/ >> stable/10/sys/boot/efi/loader/arch/amd64/ >> stable/10/sys/boot/efi/loader/arch/amd64/Makefile.inc (contents, props >> changed) >> stable/10/sys/boot/efi/loader/arch/amd64/amd64_tramp.S (contents, props >> changed) >> stable/10/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c (contents, >> props changed) >> stable/10/sys/boot/efi/loader/arch/amd64/framebuffer.c (contents, props >> changed) >> stable/10/sys/boot/efi/loader/arch/amd64/framebuffer.h (contents, props >> changed) >> stable/10/sys/boot/efi/loader/arch/amd64/ldscript.amd64 (contents, props >> changed) >> stable/10/sys/boot/efi/loader/arch/amd64/reloc.c (contents, props >> changed) >> stable/10/sys/boot/efi/loader/arch/amd64/start.S (contents, props >> changed) >> stable/10/sys/boot/efi/loader/autoload.c (contents, props changed) >> stable/10/sys/boot/efi/loader/bootinfo.c (contents, props changed) >> stable/10/sys/boot/efi/loader/conf.c (contents, props changed) >> stable/10/sys/boot/efi/loader/copy.c (contents, props changed) >> stable/10/sys/boot/efi/loader/devicename.c (contents, props changed) >> stable/10/sys/boot/efi/loader/loader_efi.h (contents, props changed) >> stable/10/sys/boot/efi/loader/main.c (contents, props changed) >> stable/10/sys/boot/efi/loader/version (contents, props changed) >> Modified: >> stable/10/sys/boot/efi/Makefile >> stable/10/sys/boot/efi/Makefile.inc >> >> Modified: stable/10/sys/boot/efi/Makefile >> ============================================================================== >> --- stable/10/sys/boot/efi/Makefile Thu Jan 7 02:06:14 2016 (r293296) >> +++ stable/10/sys/boot/efi/Makefile Thu Jan 7 02:22:45 2016 (r293297) >> @@ -2,4 +2,8 @@ >> >> SUBDIR= libefi >> >> +.if ${MACHINE_CPUARCH} == "amd64" >> +SUBDIR+= loader boot1 >> +.endif >> + >> .include >> >> Modified: stable/10/sys/boot/efi/Makefile.inc >> ============================================================================== >> --- stable/10/sys/boot/efi/Makefile.inc Thu Jan 7 02:06:14 2016 (r293296) >> +++ stable/10/sys/boot/efi/Makefile.inc Thu Jan 7 02:22:45 2016 (r293297) >> @@ -7,7 +7,10 @@ CFLAGS+= -march=i386 >> .endif >> >> # Options used when building app-specific efi components >> +# See conf/kern.mk for the correct set of these >> CFLAGS+= -ffreestanding -fshort-wchar -Wformat >> +CFLAGS+= -mno-red-zone >> +CFLAGS+= -mno-mmx -mno-sse -mno-aes -mno-avx -msoft-float >> LDFLAGS+= -nostdlib >> >> .include "../Makefile.inc" >> >> Added: stable/10/sys/boot/efi/boot1/Makefile >> ============================================================================== >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> +++ stable/10/sys/boot/efi/boot1/Makefile Thu Jan 7 02:22:45 >> 2016 (r293297) >> @@ -0,0 +1,84 @@ >> +# $FreeBSD$ >> + >> +MAN= >> + >> +.include >> + >> +# In-tree GCC does not support __attribute__((ms_abi)). >> +.if ${COMPILER_TYPE} != "gcc" >> + >> +MK_SSP= no >> + >> +PROG= loader.sym >> +INTERNALPROG= >> + >> +# architecture-specific loader code >> +SRCS= boot1.c reloc.c start.S >> + >> +CFLAGS+= -fPIC >> +CFLAGS+= -I. >> +CFLAGS+= -I${.CURDIR}/../include >> +CFLAGS+= -I${.CURDIR}/../include/${MACHINE_CPUARCH} >> +CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica/include >> +CFLAGS+= -I${.CURDIR}/../../.. >> + >> +# Always add MI sources and REGULAR efi loader bits >> +.PATH: ${.CURDIR}/../loader/arch/amd64 ${.CURDIR}/../../common >> +CFLAGS+= -I${.CURDIR}/../../common >> + >> +FILES= boot1.efi boot1.efifat >> +FILESMODE_boot1.efi= ${BINMODE} >> + >> +LDSCRIPT= ${.CURDIR}/../loader/arch/${MACHINE_CPUARCH}/ldscript.${MACHINE_CPUARCH} >> +LDFLAGS= -Wl,-T${LDSCRIPT} -Wl,-Bsymbolic -shared -Wl,-znocombreloc >> + >> +${PROG}: ${LDSCRIPT} >> + >> +OBJCOPY?= objcopy >> +OBJDUMP?= objdump >> + >> +.if ${MACHINE_CPUARCH} == "amd64" >> +EFI_TARGET= efi-app-x86_64 >> +.elif ${MACHINE_CPUARCH} == "i386" >> +EFI_TARGET= efi-app-ia32 >> +.endif >> + >> +boot1.efi: loader.sym >> + if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \ >> + ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \ > New build warning on this ^ lines: > > sh: -t: not found > /usr/obj/jenkins/workspace/HardenedBSD-stable-10-STABLE-master-amd64/sys/boot/efi/boot1 > 66+1 records in > 66+1 records out > 33811 bytes transferred in 0.000617 secs (54832354 bytes/sec) > > See the jenkins log: > http://jenkins.hardenedbsd.org:8180/jenkins/job/HardenedBSD-stable-10-STABLE-master-amd64/lastSuccessfulBuild/consoleFull > > Possible solution to add objdump to bootstrap utils. > > >> + exit 1; \ >> + fi >> + ${OBJCOPY} -j .text -j .sdata -j .data \ >> + -j .dynamic -j .dynsym -j .rel.dyn \ >> + -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \ >> + --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} >> + >> +boot1.o: ${.CURDIR}/../../common/ufsread.c >> + >> +# The following inserts out objects into a template FAT file system >> +# created by generate-fat.sh >> + >> +.include "${.CURDIR}/Makefile.fat" >> + >> +boot1.efifat: boot1.efi >> + echo ${.OBJDIR} >> + uudecode ${.CURDIR}/fat.tmpl.bz2.uu >> + mv fat.tmpl.bz2 ${.TARGET}.bz2 >> + bzip2 -f -d ${.TARGET}.bz2 >> + dd if=boot1.efi of=${.TARGET} seek=${BOOT1_OFFSET} conv=notrunc >> + >> +CLEANFILES= boot1.efifat >> + >> +.endif # ${COMPILER_TYPE} != "gcc" >> + >> +.include >> + >> +beforedepend ${OBJS}: machine x86 >> + >> +CLEANFILES+= machine x86 boot1.efi >> + >> +machine: >> + ln -sf ${.CURDIR}/../../../amd64/include machine >> + >> +x86: >> + ln -sf ${.CURDIR}/../../../x86/include x86 >> >> Added: stable/10/sys/boot/efi/boot1/Makefile.fat >> ============================================================================== >> --- /dev/null 00:00:00 1970 (empty, because file is newly added) >> +++ stable/10/sys/boot/efi/boot1/Makefile.fat Thu Jan 7 02:22:45 >> 2016 (r293297) >> @@ -0,0 +1,3 @@ >> +# This file autogenerated by generate-fat.sh - DO NOT EDIT >> +# $FreeBSD$ >> +BOOT1_OFFSET=0x2d >>