From 6c65d531e9dbfce6b5647183ff4a22b0dc85ccbe Mon Sep 17 00:00:00 2001 From: green Date: Mon, 7 Oct 2002 22:21:16 +0000 Subject: Correct a bug in adding 0x700 to a number. --- sys/boot/i386/boot2/Makefile | 4 +++- sys/boot/i386/gptboot/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'sys') diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index 05567c1..7f3e2f7 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -24,6 +24,7 @@ BTX= ${.OBJDIR}/../btx BTX= ${.CURDIR}/../btx .endif +REL1= 0x700 ORG1= 0x7c00 ORG2= 0x1000 @@ -68,7 +69,8 @@ boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c boot2.h: boot1.out ${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \ - { x = $$1 - ORG1; printf("#define XREADORG 0x7%x\n", x) }' \ + { x = $$1 - ORG1; \ + printf("#define XREADORG %#x\n", REL1 + x) }' \ ORG1=`printf "%d" ${ORG1}` > boot2.h boot2: boot2.ldr boot2.bin ${BTX}/btx/btx diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index 05567c1..7f3e2f7 100644 --- a/sys/boot/i386/gptboot/Makefile +++ b/sys/boot/i386/gptboot/Makefile @@ -24,6 +24,7 @@ BTX= ${.OBJDIR}/../btx BTX= ${.CURDIR}/../btx .endif +REL1= 0x700 ORG1= 0x7c00 ORG2= 0x1000 @@ -68,7 +69,8 @@ boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c boot2.h: boot1.out ${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \ - { x = $$1 - ORG1; printf("#define XREADORG 0x7%x\n", x) }' \ + { x = $$1 - ORG1; \ + printf("#define XREADORG %#x\n", REL1 + x) }' \ ORG1=`printf "%d" ${ORG1}` > boot2.h boot2: boot2.ldr boot2.bin ${BTX}/btx/btx -- cgit v1.1