[Qemu-devel] [PATCH 02/14] pcbios: fix makesym.perl

[Isaku Yamahata]

as86 symbols output doesn't always 7 colums.
[CNEI] may be appended depending on symbol type.
This patch makes the parser delete the type.

Signed-off-by: Isaku Yamahata <address@hidden>
---
 Makefile     |    4 ++--
 makesym.perl |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5427abf..ddf30d3 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ dist-clean: clean
 bios-clean:
        $(RM) BIOS-bochs-*
 
-BIOS-bochs-legacy: rombios.c apmbios.S biossums rombios.h
+BIOS-bochs-legacy: rombios.c apmbios.S biossums rombios.h makesym.perl
        $(CPP) $(BIOS_BUILD_DATE) -DLEGACY -P $< > _rombiosl_.c
        $(BCC) -o rombiosl.s -C-c -D__i86__ -0 -S _rombiosl_.c
        sed -e 's/^\.text//' -e 's/^\.data//' rombiosl.s > _rombiosl_.s
@@ -65,7 +65,7 @@ BIOS-bochs-legacy: rombios.c apmbios.S biossums rombios.h
        $(RM) _rombiosl_.s
 
 
-rombios16.bin: rombios.c apmbios.S biossums rombios.h
+rombios16.bin: rombios.c apmbios.S biossums rombios.h makesym.perl
        $(CPP) $(BIOS_BUILD_DATE) -P $< > _rombios_.c
        $(BCC) -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c
        sed -e 's/^\.text//' -e 's/^\.data//' rombios.s > _rombios_.s
diff --git a/makesym.perl b/makesym.perl
index 0b6c94a..c220200 100755
--- a/makesym.perl
+++ b/makesym.perl
@@ -19,6 +19,7 @@ while (<STDIN>) {
     $where = $WHERE_AFTER_SYM_TABLE;
   }
   if ($where == $WHERE_IN_SYM_TABLE) {
+    s/\b[CNEI]\b/ /eg;
     @F = split (/\s+/);
     ($name[0], $junk, $addr[0], $junk, $name[1], $junk, $addr[1]) = @F;
     foreach $col (0,1) {
-- 
1.6.0.2