Browse Source

Merge pull request #5197 from e4t/z-arch-exec-stack

On zarch don't produce objects from assembler with a writable stack s…
tags/v0.3.30
Martin Kroeker GitHub 10 months ago
parent
commit
f90eff306d
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
7 changed files with 22 additions and 2 deletions
  1. +9
    -2
      common_zarch.h
  2. +3
    -0
      cpuid.S
  3. +2
    -0
      kernel/zarch/ctrmm4x4V.S
  4. +2
    -0
      kernel/zarch/gemm8x4V.S
  5. +2
    -0
      kernel/zarch/strmm8x4V.S
  6. +2
    -0
      kernel/zarch/trmm8x4V.S
  7. +2
    -0
      kernel/zarch/ztrmm4x4V.S

+ 9
- 2
common_zarch.h View File

@@ -103,9 +103,16 @@ static inline int blas_quickdivide(blasint x, blasint y){
.global REALNAME ;\
.type REALNAME, %function ;\
REALNAME:

#define EPILOGUE
#if defined(__ELF__) && defined(__linux__)
# define GNUSTACK .section .note.GNU-stack,"",@progbits
#else
# define GNUSTACK
#endif

#define EPILOGUE \
.size REALNAME, .-REALNAME; \
GNUSTACK

#define PROFCODE



+ 3
- 0
cpuid.S View File

@@ -65,3 +65,6 @@ _cpuid:
.subsections_via_symbols

#endif
#if defined(__ELF__) && defined(__linux__)
.section .note.GNU-stack,"",@progbits
#endif

+ 2
- 0
kernel/zarch/ctrmm4x4V.S View File

@@ -714,6 +714,8 @@ ld %f10,136(%r15)
ld %f11,144(%r15)
ld %f12,152(%r15)
br %r14

EPILOGUE
.end




+ 2
- 0
kernel/zarch/gemm8x4V.S View File

@@ -604,6 +604,8 @@ ALIGN_2
/*end*/
lmg %r6,%r12,48(%r15)
br %r14

EPILOGUE
.end




+ 2
- 0
kernel/zarch/strmm8x4V.S View File

@@ -845,6 +845,8 @@ ALIGN_2
lmg %r6,%r12,48(%r15)
#endif
br %r14

EPILOGUE
.end




+ 2
- 0
kernel/zarch/trmm8x4V.S View File

@@ -864,6 +864,8 @@ ALIGN_2
lmg %r6,%r12,48(%r15)
#endif
br %r14

EPILOGUE
.end




+ 2
- 0
kernel/zarch/ztrmm4x4V.S View File

@@ -719,6 +719,8 @@ ld %f10,136(%r15)
ld %f11,144(%r15)
ld %f12,152(%r15)
br %r14

EPILOGUE
.end




Loading…
Cancel
Save