diff --git a/[refs] b/[refs] index 46e379cd70b9..4f4350dffc96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ddf146f70a44ed4133dea4d377b172605a1cfa5 +refs/heads/master: e89cef136a8b56eef1acf702591fd3039fc3385d diff --git a/trunk/tools/perf/bench/mem-memset-x86-64-asm.S b/trunk/tools/perf/bench/mem-memset-x86-64-asm.S index cb9217063776..9e5af89ed13a 100644 --- a/trunk/tools/perf/bench/mem-memset-x86-64-asm.S +++ b/trunk/tools/perf/bench/mem-memset-x86-64-asm.S @@ -4,3 +4,10 @@ #define Lmemset_c globl memset_c; memset_c #define Lmemset_c_e globl memset_c_e; memset_c_e #include "../../../arch/x86/lib/memset_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