asmconv in /usr/bin, other fixes

diff --git a/commands/i386/acd.descr b/commands/i386/acd.descr
index 0d3d1c73bd9a6e76ed30826bb918bfb4ba23b53f..36593e314a02e714298d55107960960ef066415c 100644 (file)
--- a/commands/i386/acd.descr
+++ b/commands/i386/acd.descr
@@ -36,7 +36,7 @@ ACK_CG =      $A/$ARCH/cg
 ACK_AS =       $A/$ARCH/as \-
 ACK_LED =      $A/em_led -a0:$W -a1:$W -a2:$W -a3:$W
 ACK_CV =       $A/cv
-ASMCONV =      $L/asmconv
+ASMCONV =      /usr/bin/asmconv
 AAL =          /usr/bin/aal
 
 # Minix predefined symbols.

diff --git a/commands/i386/asmconv/Makefile b/commands/i386/asmconv/Makefile
index 29f81b3fa18232e43a3bda7e4850284d3b5c0b5c..3c99951917726fae9793c924fe95c67dca71b2ce 100644 (file)
--- a/commands/i386/asmconv/Makefile
+++ b/commands/i386/asmconv/Makefile
@@ -13,9 +13,9 @@ asmconv:      $(OBJ)
        $(CC) $(LDFLAGS) -o $@ $(OBJ)
        install -S 8kw $@
 
-install:       /usr/lib/asmconv
+install:       /usr/bin/asmconv
 
-/usr/lib/asmconv:      asmconv
+/usr/bin/asmconv:      asmconv
        install -cs -o bin asmconv $@
 
 clean:

diff --git a/commands/i386/asmconv/emit_gnu.c b/commands/i386/asmconv/emit_gnu.c
index 54726be4c0274026b99e3a8f721ad73c3564ccc6..ba8c148bf35feb1aede5dd419df96770d3fcc576 100644 (file)
--- a/commands/i386/asmconv/emit_gnu.c
+++ b/commands/i386/asmconv/emit_gnu.c
@@ -506,6 +506,9 @@ void gnu_emit_instruction(asm86_t *a)
                }
        }
 
+       if (a->opcode == DOT_END) {
+               /* Ignore .end in gnu mode. */
+       } else
        if (a->opcode == DOT_LABEL) {
                assert(a->args->operator == ':');
                gnu_printf("%s:", a->args->name);

diff --git a/commands/scripts/binsizes.sh b/commands/scripts/binsizes.sh
index a471b0ac11c462ee56debebe3f817816cc4c8af0..dcc3faa5378d1f88c4078896b872285ecdde1de6 100644 (file)
--- a/commands/scripts/binsizes.sh
+++ b/commands/scripts/binsizes.sh
@@ -13,7 +13,7 @@ if [ "$1" != normal ]
 then   t=$t.$1
 fi
 
-chmem =250000 /usr/lib/em_* /usr/lib/cpp* /usr/lib/cv /usr/lib/asmconv >/dev/null 2>&1
+chmem =250000 /usr/lib/em_* /usr/lib/cpp* /usr/lib/cv >/dev/null 2>&1
 chmem =600000 /usr/lib/ego/*  >/dev/null 2>&1
 if [ -f $t ]
 then   cat "$t" | while read line

diff --git a/lib/generate.sh b/lib/generate.sh
index f520a32e78afd1c17490ab14a85bf083e7bcc331..887ec3c75ff610bd0a5d1f822efa4cb9c1fbf2e0 100644 (file)
--- a/lib/generate.sh
+++ b/lib/generate.sh
@@ -133,7 +133,7 @@ gnuCommands()
        
        case $srcfile in
        *.s )
-               echo "  gcc $CFLAGS -E -x assembler-with-cpp -I. $srcfile | asmconv -mi386 ack gnu > $GNUBASE/$OBJDIR/$srcfile.gnu || true"
+               echo "  gcc $CFLAGS -E -x assembler-with-cpp -I. $srcfile | asmconv -mi386 ack gnu > $GNUBASE/$OBJDIR/$srcfile.gnu"
                echo "  gas -o $dstfile $GNUBASE/$OBJDIR/$srcfile.gnu"
                
                echo "  mkdep 'gcc $CFLAGS -E -x assembler-with-cpp -I.' $srcfile | $sedcmd >> .depend-gnu" >&4