Merge branch 'develop' into armv7

common_alpha.h

@@ -151,7 +151,7 @@ REALNAME:
 #endif
 
 #if defined(__linux__) && defined(__ELF__)
-#define GNUSTACK .section .note.GNU-stack,"",%progbits
+#define GNUSTACK .section .note.GNU-stack,"",@progbits
 #else
 #define GNUSTACK
 #endif

common_ia64.h

@@ -380,7 +380,7 @@ REALNAME:
 #endif
 
 #if defined(__linux__) && defined(__ELF__)
-#define GNUSTACK .section .note.GNU-stack,"",%progbits
+#define GNUSTACK .section .note.GNU-stack,"",@progbits
 #else
 #define GNUSTACK
 #endif

common_mips64.h

@@ -236,7 +236,7 @@ REALNAME: ;\
 	.set	nomacro
 
 #if defined(__linux__) && defined(__ELF__)
-#define GNUSTACK .section .note.GNU-stack,"",%progbits
+#define GNUSTACK .section .note.GNU-stack,"",@progbits
 #else
 #define GNUSTACK
 #endif

common_sparc.h

@@ -201,7 +201,7 @@ static __inline int blas_quickdivide(blasint x, blasint y){
 REALNAME:;
 
 #if defined(__linux__) && defined(__ELF__)
-#define GNUSTACK .section .note.GNU-stack,"",%progbits
+#define GNUSTACK .section .note.GNU-stack,"",@progbits
 #else
 #define GNUSTACK
 #endif

common_x86.h

@@ -303,7 +303,7 @@ REALNAME:
 
 #define EPILOGUE \
         .size	 REALNAME, .-REALNAME; \
-        .section .note.GNU-stack,"",%progbits
+        .section .note.GNU-stack,"",@progbits
 
 #endif
 

common_x86_64.h

@@ -374,7 +374,7 @@ REALNAME:
 
 #define EPILOGUE \
         .size	 REALNAME, .-REALNAME; \
-        .section .note.GNU-stack,"",%progbits
+        .section .note.GNU-stack,"",@progbits
 
 
 #endif

exports/Makefile

@@ -126,7 +126,7 @@ so : ../$(LIBSONAME)
 ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
-	-Wl,--retain-symbols-file=linux.def -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
+	-Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) $(EXTRALIB)
 ifneq ($(C_COMPILER), LSB)
 	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
 else
@@ -145,7 +145,7 @@ so : ../$(LIBSONAME)
 ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
 	$(CC) $(CFLAGS) $(LDFLAGS)  -shared -o ../$(LIBSONAME) \
 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
-	-Wl,--retain-symbols-file=linux.def $(FEXTRALIB) $(EXTRALIB)
+	$(FEXTRALIB) $(EXTRALIB)
 	$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
 	rm -f linktest
 

kernel/x86_64/dgemv_t.S

@@ -171,7 +171,7 @@
 .L0x:
 	xorq	M,M
 	addq	$1,M
-	salq	$22,M
+	salq	$21,M
 	subq	M,MMM
 	jge .L00