merge from develop

diff --git a/common_x86.h b/common_x86.h
index 8245f70..5f42843 100644 (file)
--- a/common_x86.h
+++ b/common_x86.h
@@ -301,23 +301,10 @@ REALNAME:
 #define PROFCODE
 #endif
 
-
-#if defined(C_PATHSCALE) || defined(OS_DARWIN)
-
 #define EPILOGUE \
-        .size    REALNAME, .-REALNAME; \
+        .size   REALNAME, .-REALNAME; \
         .section .note.GNU-stack,"",@progbits
 
-#else
-
-#define EPILOGUE \
-        .size    REALNAME, .-REALNAME; \
-        .section .note.GNU-stack,"",%progbits
-
-#endif
-
-
-
 #endif
 
 #ifdef XDOUBLE

diff --git a/common_x86_64.h b/common_x86_64.h
index 4fe2344..39e5a5e 100644 (file)
--- a/common_x86_64.h
+++ b/common_x86_64.h
@@ -372,20 +372,10 @@ REALNAME:
 #define PROFCODE
 #endif
 
-#if defined(C_PATHSCALE) || defined(OS_DARWIN)
-
 #define EPILOGUE \
         .size   REALNAME, .-REALNAME; \
         .section .note.GNU-stack,"",@progbits
 
-#else
-
-#define EPILOGUE \
-        .size   REALNAME, .-REALNAME; \
-        .section .note.GNU-stack,"",%progbits
-
-#endif
-
 
 #endif