From 7bbb9afba4e8826e6d23dc2cc71ecc26b2a2fc50 Mon Sep 17 00:00:00 2001
From: Cyril SIX <cyril.six@kalray.eu>
Date: Fri, 29 May 2020 16:52:57 +0200
Subject: Using kvx-elf-ar instead of ar

---
 runtime/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/Makefile b/runtime/Makefile
index ea3c914f..ed4c1d39 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -38,6 +38,12 @@ OBJS=i64_dtos.o i64_dtou.o i64_sar.o i64_sdiv.o i64_shl.o \
   vararg.o
 endif
 
+ifeq ($(ARCH),kvx)
+	AR=kvx-elf-ar
+else
+	AR=ar
+endif
+
 OBJS+=write_profiling_table.o
 
 LIB=libcompcert.a
@@ -59,7 +65,7 @@ endif
 
 $(LIB): $(OBJS)
 	rm -f $(LIB)
-	ar rcs $(LIB) $(OBJS)
+	$(AR) rcs $(LIB) $(OBJS)
 
 %.o: %.s
 	$(CASMRUNTIME) -o $@ $^
-- 
cgit 


From e10c28fd65b07894adabd1c1508bc853da3c19bd Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Fri, 2 Oct 2020 22:32:04 +0200
Subject: fix need for kvx-elf

---
 runtime/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'runtime')

diff --git a/runtime/Makefile b/runtime/Makefile
index ed4c1d39..6f70fa87 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -38,11 +38,7 @@ OBJS=i64_dtos.o i64_dtou.o i64_sar.o i64_sdiv.o i64_shl.o \
   vararg.o
 endif
 
-ifeq ($(ARCH),kvx)
-	AR=kvx-elf-ar
-else
-	AR=ar
-endif
+AR=ar
 
 OBJS+=write_profiling_table.o
 
-- 
cgit