From 7eec989c223eb18b358c679d617bd4ec4dd1f19e Mon Sep 17 00:00:00 2001 From: Tee-Kiah Chia Date: Sat, 7 Apr 2018 22:20:37 +0800 Subject: [PATCH 1/2] ia16-elf-gcc: use ia16-elf-objcopy instead of host objcopy to process the ia16-elf object files --- mkfiles/gcc.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkfiles/gcc.mak b/mkfiles/gcc.mak index b5cd9be..0e167b1 100644 --- a/mkfiles/gcc.mak +++ b/mkfiles/gcc.mak @@ -67,7 +67,7 @@ ifeq ($(LOADSEG)0, 0) LOADSEG=0x60 endif -INITPATCH=objcopy --redefine-sym ___umodsi3=_init_umodsi3 --redefine-sym ___udivsi3=_init_udivsi3 --redefine-sym ___ashlsi3=_init_ashlsi3 --redefine-sym ___lshrsi3=_init_lshrsi3 +INITPATCH=ia16-elf-objcopy --redefine-sym ___umodsi3=_init_umodsi3 --redefine-sym ___udivsi3=_init_udivsi3 --redefine-sym ___ashlsi3=_init_ashlsi3 --redefine-sym ___lshrsi3=_init_lshrsi3 CLDEF=1 CLT=gcc -DDOSC_TIME_H -I../hdr -o $@ CLC=$(CLT) From 2111b543c113c2660c25ae6a4fce59baea0d1c06 Mon Sep 17 00:00:00 2001 From: Tee-Kiah Chia Date: Sat, 7 Apr 2018 22:22:12 +0800 Subject: [PATCH 2/2] Fix minor issues in diagnostic messages in utils/exeflat.c --- utils/exeflat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/exeflat.c b/utils/exeflat.c index 9f291b4..d055f98 100644 --- a/utils/exeflat.c +++ b/utils/exeflat.c @@ -125,8 +125,8 @@ static int exeflat(const char *srcfile, const char *dstfile, ((DWORD) (header->exPages - 1) << 9) + header->exExtraBytes - header->exHeaderSize * 16UL; printf("image size (less header) = %lu = 0x%lx\n", size, size); - printf("first relocation offset = %u = 0x%u\n", header->exOverlay, - header->exOverlay); + printf("first relocation offset = %u = 0x%x\n", header->exRelocTable, + header->exRelocTable); /* first read file into memory chunks */ fseek(src, header->exHeaderSize * 16UL, SEEK_SET); @@ -150,7 +150,7 @@ static int exeflat(const char *srcfile, const char *dstfile, } if (fread(*curbuf, sizeof(char), bufsize, src) != bufsize) { - printf("Source file read error %ld %d\n", to_xfer, bufsize); + printf("Source file read error %ld %d\n", to_xfer, (int)bufsize); exit(1); } } @@ -381,7 +381,7 @@ int main(int argc, char **argv) if (silentcount >= LENGTH(silentSegments)) { printf("can't handle more then %d silent's\n", - LENGTH(silentSegments)); + (int)LENGTH(silentSegments)); exit(1); }