Merge branch 'develop' into armv7
This commit is contained in:
commit
9d3fae15a8
|
@ -151,7 +151,7 @@ REALNAME:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__linux__) && defined(__ELF__)
|
#if defined(__linux__) && defined(__ELF__)
|
||||||
#define GNUSTACK .section .note.GNU-stack,"",%progbits
|
#define GNUSTACK .section .note.GNU-stack,"",@progbits
|
||||||
#else
|
#else
|
||||||
#define GNUSTACK
|
#define GNUSTACK
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -380,7 +380,7 @@ REALNAME:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__linux__) && defined(__ELF__)
|
#if defined(__linux__) && defined(__ELF__)
|
||||||
#define GNUSTACK .section .note.GNU-stack,"",%progbits
|
#define GNUSTACK .section .note.GNU-stack,"",@progbits
|
||||||
#else
|
#else
|
||||||
#define GNUSTACK
|
#define GNUSTACK
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -236,7 +236,7 @@ REALNAME: ;\
|
||||||
.set nomacro
|
.set nomacro
|
||||||
|
|
||||||
#if defined(__linux__) && defined(__ELF__)
|
#if defined(__linux__) && defined(__ELF__)
|
||||||
#define GNUSTACK .section .note.GNU-stack,"",%progbits
|
#define GNUSTACK .section .note.GNU-stack,"",@progbits
|
||||||
#else
|
#else
|
||||||
#define GNUSTACK
|
#define GNUSTACK
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -201,7 +201,7 @@ static __inline int blas_quickdivide(blasint x, blasint y){
|
||||||
REALNAME:;
|
REALNAME:;
|
||||||
|
|
||||||
#if defined(__linux__) && defined(__ELF__)
|
#if defined(__linux__) && defined(__ELF__)
|
||||||
#define GNUSTACK .section .note.GNU-stack,"",%progbits
|
#define GNUSTACK .section .note.GNU-stack,"",@progbits
|
||||||
#else
|
#else
|
||||||
#define GNUSTACK
|
#define GNUSTACK
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -303,7 +303,7 @@ REALNAME:
|
||||||
|
|
||||||
#define EPILOGUE \
|
#define EPILOGUE \
|
||||||
.size REALNAME, .-REALNAME; \
|
.size REALNAME, .-REALNAME; \
|
||||||
.section .note.GNU-stack,"",%progbits
|
.section .note.GNU-stack,"",@progbits
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -374,7 +374,7 @@ REALNAME:
|
||||||
|
|
||||||
#define EPILOGUE \
|
#define EPILOGUE \
|
||||||
.size REALNAME, .-REALNAME; \
|
.size REALNAME, .-REALNAME; \
|
||||||
.section .note.GNU-stack,"",%progbits
|
.section .note.GNU-stack,"",@progbits
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -126,7 +126,7 @@ so : ../$(LIBSONAME)
|
||||||
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
|
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
||||||
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
|
-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)
|
ifneq ($(C_COMPILER), LSB)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
||||||
else
|
else
|
||||||
|
@ -145,7 +145,7 @@ so : ../$(LIBSONAME)
|
||||||
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
|
../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
||||||
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive \
|
-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.
|
$(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK.
|
||||||
rm -f linktest
|
rm -f linktest
|
||||||
|
|
||||||
|
|
|
@ -171,7 +171,7 @@
|
||||||
.L0x:
|
.L0x:
|
||||||
xorq M,M
|
xorq M,M
|
||||||
addq $1,M
|
addq $1,M
|
||||||
salq $22,M
|
salq $21,M
|
||||||
subq M,MMM
|
subq M,MMM
|
||||||
jge .L00
|
jge .L00
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue