From 7173f6fe25f39a22c0342f81c8f49546b3a90120 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 27 May 2009 22:23:33 -0400 Subject: [PATCH] Keep relocated 16bit code so checkstack can use it. Make was stripping the relocated 16bit code - keep the unstripped 16bit code so that checkstack can parse it. --- Makefile | 4 ++-- tools/checkstack.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3a4a1e9..bd5c184 100644 --- a/Makefile +++ b/Makefile @@ -119,8 +119,8 @@ $(OUT)rom16.o: $(OUT)romlayout16.o $(OUT)rom32.o $(OUT)layout16.lds $(OUT)rom.o: $(OUT)rom16.o $(OUT)rom32.o $(OUT)rombios16.lds $(OUT)rombios.lds @echo " Linking $@" - $(Q)$(LD) -T $(OUT)rombios16.lds $(OUT)rom16.o -R $(OUT)rom32.o -o $(OUT)rom16.final.o - $(Q)$(STRIP) $(OUT)rom16.final.o + $(Q)$(LD) -T $(OUT)rombios16.lds $(OUT)rom16.o -R $(OUT)rom32.o -o $(OUT)rom16.reloc.o + $(Q)$(STRIP) $(OUT)rom16.reloc.o -o $(OUT)rom16.final.o $(Q)$(OBJCOPY) --extract-symbol --adjust-vma 0xf0000 $(OUT)rom16.o $(OUT)rom16.moved.o $(Q)$(LD) -T $(OUT)rombios.lds $(OUT)rom16.final.o $(OUT)rom32.o -R $(OUT)rom16.moved.o -o $@ diff --git a/tools/checkstack.py b/tools/checkstack.py index 503fbf3..7cc48ad 100755 --- a/tools/checkstack.py +++ b/tools/checkstack.py @@ -7,7 +7,7 @@ # This file may be distributed under the terms of the GNU GPLv3 license. # Usage: -# objdump -m i386 -M i8086 -M suffix -d out/rom16.o | tools/checkstack.py +# objdump -m i386 -M i8086 -M suffix -d out/rom16.reloc.o | tools/checkstack.py import sys import re -- 2.25.1