Refs #509. Fixed geadd building bug with DYNAMIC_ARCH=1.

diff --git a/common_z.h b/common_z.h
index 85f577a..b171227 100644 (file)
--- a/common_z.h
+++ b/common_z.h
@@ -404,7 +404,7 @@
 #define ZOMATCOPY_K_CTC         gotoblas -> zomatcopy_k_ctc
 #define ZOMATCOPY_K_RTC         gotoblas -> zomatcopy_k_rtc
 
-#define ZGEADD_K                zgeadd_k 
+#define ZGEADD_K                gotoblas -> zgeadd_k
 
 #endif
 

diff --git a/kernel/Makefile.L3 b/kernel/Makefile.L3
index a3ccc19..fdbae2d 100644 (file)
--- a/kernel/Makefile.L3
+++ b/kernel/Makefile.L3
@@ -3445,28 +3445,28 @@ $(KDIR)zomatcopy_k_rtc$(TSUFFIX).$(SUFFIX) : $(KERNELDIR)/$(ZOMATCOPY_RTC)
 
 
 ifndef SGEADD_K
-SGEADD_K = ../arm/geadd.c
+SGEADD_K = ../generic/geadd.c
 endif
 
 $(KDIR)sgeadd_k$(TSUFFIX).$(SUFFIX) : $(KERNELDIR)/$(SGEADD_K)
        $(CC) $(CFLAGS) -c -UDOUBLE -UCOMPLEX -UROWM $< -o $@
 
 ifndef DGEADD_K
-DGEADD_K = ../arm/geadd.c
+DGEADD_K = ../generic/geadd.c
 endif
 
 $(KDIR)dgeadd_k$(TSUFFIX).$(SUFFIX) : $(KERNELDIR)/$(SGEADD_K)
        $(CC) $(CFLAGS) -c -DDOUBLE -UCOMPLEX -UROWM $< -o $@
 
 ifndef CGEADD_K
-CGEADD_K = ../arm/zgeadd.c
+CGEADD_K = ../generic/zgeadd.c
 endif
 
 $(KDIR)cgeadd_k$(TSUFFIX).$(SUFFIX) : $(KERNELDIR)/$(CGEADD_K)
        $(CC) $(CFLAGS) -c -UDOUBLE -DCOMPLEX -UROWM $< -o $@
 
 ifndef ZGEADD_K
-ZGEADD_K = ../arm/zgeadd.c
+ZGEADD_K = ../generic/zgeadd.c
 endif
 
 $(KDIR)zgeadd_k$(TSUFFIX).$(SUFFIX) : $(KERNELDIR)/$(ZGEADD_K)

diff --git a/kernel/arm/geadd.c b/kernel/generic/geadd.c
similarity index 100%
rename from kernel/arm/geadd.c
rename to kernel/generic/geadd.c

diff --git a/kernel/arm/zgeadd.c b/kernel/generic/zgeadd.c
similarity index 100%
rename from kernel/arm/zgeadd.c
rename to kernel/generic/zgeadd.c

diff --git a/kernel/setparam-ref.c b/kernel/setparam-ref.c
index 1fa7f79..0eeac2e 100644 (file)
--- a/kernel/setparam-ref.c
+++ b/kernel/setparam-ref.c
@@ -548,8 +548,9 @@ gotoblas_t TABLE_NAME = {
   comatcopy_k_cnTS, comatcopy_k_ctTS, comatcopy_k_rnTS, comatcopy_k_rtTS,
   comatcopy_k_cncTS, comatcopy_k_ctcTS, comatcopy_k_rncTS, comatcopy_k_rtcTS,
   zomatcopy_k_cnTS, zomatcopy_k_ctTS, zomatcopy_k_rnTS, zomatcopy_k_rtTS,
-  zomatcopy_k_cncTS, zomatcopy_k_ctcTS, zomatcopy_k_rncTS, zomatcopy_k_rtcTS
+  zomatcopy_k_cncTS, zomatcopy_k_ctcTS, zomatcopy_k_rncTS, zomatcopy_k_rtcTS,
 
+  sgeadd_kTS, dgeadd_kTS, cgeadd_kTS, zgeadd_kTS
 
 };