small asmconv cleanups.
- put asmconv in /usr/bin so it can be invoked without absolute path - make it ignore .end in gnu output mode so that it can be invoked without '|| true' in the gnu lib makefiles and it doesn't produce the messy error message
This commit is contained in:
parent
c7f1b547cb
commit
3bcfb76e45
5 changed files with 8 additions and 5 deletions
|
@ -36,7 +36,7 @@ ACK_CG = $A/$ARCH/cg
|
||||||
ACK_AS = $A/$ARCH/as \-
|
ACK_AS = $A/$ARCH/as \-
|
||||||
ACK_LED = $A/em_led -a0:$W -a1:$W -a2:$W -a3:$W
|
ACK_LED = $A/em_led -a0:$W -a1:$W -a2:$W -a3:$W
|
||||||
ACK_CV = $A/cv
|
ACK_CV = $A/cv
|
||||||
ASMCONV = $L/asmconv
|
ASMCONV = /usr/bin/asmconv
|
||||||
AAL = /usr/bin/aal
|
AAL = /usr/bin/aal
|
||||||
|
|
||||||
# Minix predefined symbols.
|
# Minix predefined symbols.
|
||||||
|
|
|
@ -13,9 +13,9 @@ asmconv: $(OBJ)
|
||||||
$(CC) $(LDFLAGS) -o $@ $(OBJ)
|
$(CC) $(LDFLAGS) -o $@ $(OBJ)
|
||||||
install -S 8kw $@
|
install -S 8kw $@
|
||||||
|
|
||||||
install: /usr/lib/asmconv
|
install: /usr/bin/asmconv
|
||||||
|
|
||||||
/usr/lib/asmconv: asmconv
|
/usr/bin/asmconv: asmconv
|
||||||
install -cs -o bin asmconv $@
|
install -cs -o bin asmconv $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -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) {
|
if (a->opcode == DOT_LABEL) {
|
||||||
assert(a->args->operator == ':');
|
assert(a->args->operator == ':');
|
||||||
gnu_printf("%s:", a->args->name);
|
gnu_printf("%s:", a->args->name);
|
||||||
|
|
|
@ -13,7 +13,7 @@ if [ "$1" != normal ]
|
||||||
then t=$t.$1
|
then t=$t.$1
|
||||||
fi
|
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
|
chmem =600000 /usr/lib/ego/* >/dev/null 2>&1
|
||||||
if [ -f $t ]
|
if [ -f $t ]
|
||||||
then cat "$t" | while read line
|
then cat "$t" | while read line
|
||||||
|
|
|
@ -133,7 +133,7 @@ gnuCommands()
|
||||||
|
|
||||||
case $srcfile in
|
case $srcfile in
|
||||||
*.s )
|
*.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 " gas -o $dstfile $GNUBASE/$OBJDIR/$srcfile.gnu"
|
||||||
|
|
||||||
echo " mkdep 'gcc $CFLAGS -E -x assembler-with-cpp -I.' $srcfile | $sedcmd >> .depend-gnu" >&4
|
echo " mkdep 'gcc $CFLAGS -E -x assembler-with-cpp -I.' $srcfile | $sedcmd >> .depend-gnu" >&4
|
||||||
|
|
Loading…
Reference in a new issue