diff --git a/[refs] b/[refs] index a4d962b04f11..2c3ba25a3de8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84f2b9b2edc09595569c7397cc3c888764ffd78b +refs/heads/master: 7a0153ee15575a4d07b5da8c96b79e0b0fd41a12 diff --git a/trunk/tools/perf/bench/mem-memcpy-x86-64-asm.S b/trunk/tools/perf/bench/mem-memcpy-x86-64-asm.S index a57b66e853c2..185a96d66dd1 100644 --- a/trunk/tools/perf/bench/mem-memcpy-x86-64-asm.S +++ b/trunk/tools/perf/bench/mem-memcpy-x86-64-asm.S @@ -1,2 +1,8 @@ #include "../../../arch/x86/lib/memcpy_64.S" +/* + * We need to provide note.GNU-stack section, saying that we want + * NOT executable stack. Otherwise the final linking will assume that + * the ELF stack should not be restricted at all and set it RWX. + */ +.section .note.GNU-stack,"",@progbits