scc

commit 60822915915dc8c55f83238f6b434e2ef56015ac
parent a025e926f0400fd6a07922a083b5b7e49f99214c
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Thu, 17 May 2018 15:07:56 +0100

[as] Use LC_COLLATE=C in gentbl.sh

It is better to put the assignation in the own script
instead of forcing every caller to set the variable.

Diffstat:
M
as/gentbl.sh
 | 
2
+-
M
as/target/amd64.mk
 | 
3
---
M
as/target/z80.mk
 | 
2
+-

3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/as/gentbl.sh b/as/gentbl.sh
@@ -28,6 +28,6 @@ rm -f  $$.c target/$family/${cpu}tbl.c
 trap "rm -f $$.c" 0 2 3
 
 awk '!/^$/ {print $1,NR,$2,$3,$4,$5,$6}' target/$family/$family.dat |
-sort -k1 -k2n |
+LC_COLLATE=C sort -k1 -k2n |
 awk -v cpu=`echo $cpu | tr a-z A-Z` -v family=$family -f gentbl.awk  > $$.c &&
 mv $$.c target/$family/${cpu}tbl.c
diff --git a/as/target/amd64.mk b/as/target/amd64.mk
@@ -5,6 +5,3 @@ target/x86/amd64tbl.c: gentbl.awk target/x86/x86.dat target/x86/rules.dat
 
 as-amd64: $(AMD64_OBJ) $(LIBDIR)/libscc.a
 	$(CC) $(SCC_LDFLAGS) $(AMD64_OBJ) -lscc -o $@
-
-debug:
-	echo $(AMD64_OBJ)
diff --git a/as/target/z80.mk b/as/target/z80.mk
@@ -1,7 +1,7 @@
 Z80_OBJ = $(OBJ) target/x80/z80tbl.o target/x80/z80.o target/x80/ins.o
 
 target/x80/z80tbl.c: gentbl.awk target/x80/x80.dat target/x80/rules.dat
-	LC_ALL=C ./gentbl.sh -f x80 -c z80
+	./gentbl.sh -f x80 -c z80
 
 as-z80: $(OBJ) $(Z80_OBJ) $(LIBDIR)/libscc.a
 	$(CC) $(SCC_LDFLAGS) $(Z80_OBJ) -lscc -o $@