Merge remote branch 'origin/develop' into bulldozer

diff --cc common_x86_64.h
index 4fe2344,39e5a5e..2da6278
--- 1/common_x86_64.h
--- 2/common_x86_64.h
+++ b/common_x86_64.h
@@@ -378,14 -376,6 +378,14 @@@ REALNAME
          .size  REALNAME, .-REALNAME; \
          .section .note.GNU-stack,"",@progbits
  
-         .section .note.GNU-stack,"",%progbits
 +#else
 +
 +#define EPILOGUE \
 +        .size  REALNAME, .-REALNAME; \
++        .section .note.GNU-stack,"",@progbits
 +
 +#endif
 +
  
  #endif