Merge remote branch 'origin/develop' into bulldozer

diff --cc common_x86_64.h
index 4fe23448ff1a01e67ede5ab6c62ab66fb82d6904,39e5a5eb1a9e77a8750cac161cf478a169c15164..2da6278487505a617c8dd1b7b46fd64a31de6787
--- 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