Merge branch 'develop' into aix

diff --cc kernel/Makefile.L3
index 3d63ff8,86772cb..dfdaf5c
--- 1/kernel/Makefile.L3
--- 2/kernel/Makefile.L3
+++ b/kernel/Makefile.L3
@@@ -513,8 -513,8 +513,8 @@@ $(KDIR)$(SGEMMONCOPYOBJ) : $(KERNELDIR)
        $(CC) $(CFLAGS) -c -UDOUBLE -UCOMPLEX $< -o $@
  
  $(KDIR)$(SGEMMOTCOPYOBJ) : $(KERNELDIR)/$(SGEMMOTCOPY)
- ifeq ($(findstring AIXPOW, $(OS)$(filter $(TARGET), POWER8 POWER9 POWER10)),AIXPOW)
-       $(CC) $(CFLAGS) -E -UDOUBLE -UCOMPLEX $< -o sgemmotcopy.s       
+ ifeq ($(OS), AIX)
 -      $(CC) $(CFLAGS) -S -UDOUBLE -UCOMPLEX $< -o - > sgemmotcopy.s   
++      $(CC) $(CFLAGS) -S -UDOUBLE -UCOMPLEX $< -o - > sgemmotcopy.s
        m4 sgemmotcopy.s > sgemmotcopy_nomacros.s
        $(CC) $(CFLAGS) -c -UDOUBLE -UCOMPLEX sgemmotcopy_nomacros.s -o $@
        rm sgemmotcopy.s sgemmotcopy_nomacros.s
@@@ -529,8 -529,8 +529,8 @@@ $(KDIR)$(SGEMMINCOPYOBJ) : $(KERNELDIR)
        $(CC) $(CFLAGS) -c -UDOUBLE -UCOMPLEX $< -o $@
  
  $(KDIR)$(SGEMMITCOPYOBJ) : $(KERNELDIR)/$(SGEMMITCOPY)
- ifeq ($(findstring AIXPOW, $(OS)$(filter $(TARGET), POWER8 POWER9 POWER10)),AIXPOW)
-       $(CC) $(CFLAGS) -E -UDOUBLE -UCOMPLEX $< -o sgemmitcopy.s       
+ ifeq ($(OS), AIX)
 -      $(CC) $(CFLAGS) -S -UDOUBLE -UCOMPLEX $< -o - > sgemmitcopy.s   
++      $(CC) $(CFLAGS) -S -UDOUBLE -UCOMPLEX $< -o - > sgemmitcopy.s
        m4 sgemmitcopy.s > sgemmitcopy_nomacros.s
        $(CC) $(CFLAGS) -c -UDOUBLE -UCOMPLEX sgemmitcopy_nomacros.s -o $@
        rm sgemmitcopy.s sgemmitcopy_nomacros.s