Fixing k1-gcc becoming k1-mbr-gcc

5 files changed, 14 insertions, 13 deletions

diff --git a/configure b/configure
index 1b5b933d..503a899b 100755
--- a/configure
+++ b/configure
@@ -414,16 +414,17 @@ fi
 if test "$arch" = "mppa_k1c"; then
   #model_options="-march=rv64imafd -mabi=lp64d"
   # FIXME - maybe later add it for NodeOS & cie
-  model_options=-m64
+  #model_options=-m64
+  model_options=
   abi="standard"
-  casm="${toolprefix}gcc"
+  casm="k1-mbr-gcc"
   casm_options="$model_options -c"
-  cc="${toolprefix}gcc $model_options"
-  clinker="${toolprefix}gcc"
+  cc="k1-mbr-gcc $model_options"
+  clinker="k1-mbr-gcc"
   bindir="$HOME/.usr/bin"
   libdir="$HOME/.usr/lib"
   clinker_options="$model_options -L$libdir -Wl,-rpath=$libdir"
-  cprepro="${toolprefix}gcc"
+  cprepro="k1-mbr-gcc"
   cprepro_options="$model_options -std=c99 -U__GNUC__ -E"
   libmath="-lm"
   system="linux"
diff --git a/test/mppa/generate.sh b/test/mppa/generate.sh
index 765128d4..a883b8f5 100644
--- a/test/mppa/generate.sh
+++ b/test/mppa/generate.sh
@@ -13,5 +13,5 @@ mkdir -p $(dirname $writefile)
 
 #sed -n "s/^.*\/\*\s*RETURN VALUE:\s*\([0-9]*\)\s*\*\//\1/p" $1 > $2
 tmpbin=/tmp/k1-$(basename $1)-bin 
-k1-gcc -O0 $1 -o $tmpbin
+k1-mbr-gcc -O0 $1 -o $tmpbin
 (k1-cluster -- $tmpbin; echo $? > $2)
diff --git a/test/mppa/lib/Makefile b/test/mppa/lib/Makefile
index 7aeab9f3..74e7ca8b 100644
--- a/test/mppa/lib/Makefile
+++ b/test/mppa/lib/Makefile
@@ -2,7 +2,7 @@ prng-test-x86: prng.c
 	gcc -D__UNIT_TEST_PRNG__ -O2 -std=c99 $< -o $@
 
 prng-test-k1c: prng.c
-	k1-gcc -D__UNIT_TEST_PRNG__ -O2 -std=c99 $< -o $@
+	k1-mbr-gcc -D__UNIT_TEST_PRNG__ -O2 -std=c99 $< -o $@
 
 .PHONY:
 test: test-x86 test-k1c
diff --git a/test/mppa/mmult/Makefile b/test/mppa/mmult/Makefile
index 23b31d49..9c00f8b0 100644
--- a/test/mppa/mmult/Makefile
+++ b/test/mppa/mmult/Makefile
@@ -9,19 +9,19 @@ all: $(ALL)
 	gcc -D__UNIT_TEST_$$(echo $(basename $<) | tr a-z A-Z)__ -O2 -std=c99 $^ -o $@
 
 %-test-k1c: %.c $(PRNG)
-	k1-gcc -D__UNIT_TEST_$$(echo $(basename $<) | tr a-z A-Z)__ -O2 -std=c99 $^ -o $@
+	k1-mbr-gcc -D__UNIT_TEST_$$(echo $(basename $<) | tr a-z A-Z)__ -O2 -std=c99 $^ -o $@
 
 test-x86: mmult.c $(PRNG)
 	gcc -O2 -std=c99 $^ -o $@
 
 test-k1c: mmult.c $(PRNG)
-	k1-gcc -O2 -std=c99 $^ -o $@
+	k1-mbr-gcc -O2 -std=c99 $^ -o $@
 
 %.s: %.c $(CCOMP)
 	ccomp -O2 -S $< -o $@
 
 test-ccomp: mmult.s $(subst .c,.s,$(PRNG))
-	k1-gcc $^ -o $@
+	k1-mbr-gcc $^ -o $@
 
 .PHONY:
 unittest: unittest-x86 unittest-k1c
diff --git a/test/mppa/sort/Makefile b/test/mppa/sort/Makefile
index f94fe6b8..26c597be 100644
--- a/test/mppa/sort/Makefile
+++ b/test/mppa/sort/Makefile
@@ -13,19 +13,19 @@ all: $(ALL)
 	gcc -g -D__UNIT_TEST_$$(echo $(basename $<) | tr a-z A-Z)__ -O2 -std=c99 $^ -o $@
 
 %-test-k1c: %.c $(PRNG)
-	k1-gcc -g -D__UNIT_TEST_$$(echo $(basename $<) | tr a-z A-Z)__ -O2 -std=c99 $^ -o $@
+	k1-mbr-gcc -g -D__UNIT_TEST_$$(echo $(basename $<) | tr a-z A-Z)__ -O2 -std=c99 $^ -o $@
 
 test-x86: selection.c merge.c insertion.c test.c $(PRNG)
 	gcc -g -O2 -std=c99 $^ -o $@
 
 test-k1c: selection.c merge.c insertion.c test.c $(PRNG)
-	k1-gcc -g -O2 -std=c99 $^ -o $@
+	k1-mbr-gcc -g -O2 -std=c99 $^ -o $@
 
 %.s: %.c $(CCOMP)
 	ccomp -O2 -S $< -o $@
 
 test-ccomp: selection.s merge.s insertion.s test.s $(subst .c,.s,$(PRNG))
-	k1-gcc $^ -o $@
+	k1-mbr-gcc $^ -o $@
 
 .PHONY:
 unittest: unittest-x86 unittest-k1c