diff options
| author | jhb <jhb@FreeBSD.org> | 2011-06-27 21:43:56 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2011-06-27 21:43:56 +0000 |
| commit | 86a602b0bf1853f59794afbf6a837090b0090257 (patch) | |
| tree | 8729152a596580242a20545f13b2d50510a7ff3c | |
| parent | 67d464a1d85e037a433554e5ec4bc141cd2fd967 (diff) | |
| download | FreeBSD-src-86a602b0bf1853f59794afbf6a837090b0090257.zip FreeBSD-src-86a602b0bf1853f59794afbf6a837090b0090257.tar.gz | |
Revert the entry point label to 'start' to unbreak the build.
Pointy hat to: jhb
| -rw-r--r-- | sys/boot/i386/zfsboot/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/i386/zfsboot/zfsldr.S | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile index 16b2e53..65df86f 100644 --- a/sys/boot/i386/zfsboot/Makefile +++ b/sys/boot/i386/zfsboot/Makefile @@ -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 diff --git a/sys/boot/i386/zfsboot/zfsldr.S b/sys/boot/i386/zfsboot/zfsldr.S index 87e04d5..b8be282 100644 --- a/sys/boot/i386/zfsboot/zfsldr.S +++ b/sys/boot/i386/zfsboot/zfsldr.S @@ -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 |
