Date: Mon, 27 Jun 2011 21:43:56 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r223611 - head/sys/boot/i386/zfsboot Message-ID: <201106272143.p5RLhu5I015124@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Mon Jun 27 21:43:56 2011 New Revision: 223611 URL: http://svn.freebsd.org/changeset/base/223611 Log: Revert the entry point label to 'start' to unbreak the build. Pointy hat to: jhb Modified: head/sys/boot/i386/zfsboot/Makefile head/sys/boot/i386/zfsboot/zfsldr.S Modified: head/sys/boot/i386/zfsboot/Makefile ============================================================================== --- head/sys/boot/i386/zfsboot/Makefile Mon Jun 27 21:37:38 2011 (r223610) +++ head/sys/boot/i386/zfsboot/Makefile Mon Jun 27 21:43:56 2011 (r223611) @@ -57,7 +57,7 @@ zfsboot1: zfsldr.out objcopy -S -O binary zfsldr.out ${.TARGET} zfsldr.out: zfsldr.o - ${LD} ${LDFLAGS} -e main -Ttext ${ORG1} -o ${.TARGET} zfsldr.o + ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} zfsldr.o CLEANFILES+= zfsboot2 zfsboot.ld zfsboot.ldr zfsboot.bin zfsboot.out \ zfsboot.o zfsboot.s zfsboot.s.tmp sio.o cons.o drv.o util.o Modified: head/sys/boot/i386/zfsboot/zfsldr.S ============================================================================== --- head/sys/boot/i386/zfsboot/zfsldr.S Mon Jun 27 21:37:38 2011 (r223610) +++ head/sys/boot/i386/zfsboot/zfsldr.S Mon Jun 27 21:43:56 2011 (r223611) @@ -34,7 +34,7 @@ .set SIZ_SEC,0x200 # Sector size .set NSECT,0x80 - .globl main + .globl start .code16 /* @@ -46,7 +46,7 @@ * Setup the segment registers to flat addressing (segment 0) and setup the * stack to end just below the start of our code. */ -main: cld # String ops inc +start: cld # String ops inc xor %cx,%cx # Zero mov %cx,%es # Address mov %cx,%ds # data
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106272143.p5RLhu5I015124>