merge from develop

This commit is contained in:
wernsaar 2013-12-01 11:05:10 +01:00
parent 6da558d2ab
commit ac7735e01f
2 changed files with 1 additions and 24 deletions

View File

@ -301,23 +301,10 @@ REALNAME:
#define PROFCODE #define PROFCODE
#endif #endif
#if defined(C_PATHSCALE) || defined(OS_DARWIN)
#define EPILOGUE \ #define EPILOGUE \
.size REALNAME, .-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 #endif
#ifdef XDOUBLE #ifdef XDOUBLE

View File

@ -372,20 +372,10 @@ REALNAME:
#define PROFCODE #define PROFCODE
#endif #endif
#if defined(C_PATHSCALE) || defined(OS_DARWIN)
#define EPILOGUE \ #define EPILOGUE \
.size REALNAME, .-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 #endif