merge from develop

2013-12-01 11:05:10 +01:00
parent 6da558d2ab
commit ac7735e01f
2 changed files with 1 additions and 24 deletions
--- 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
--- 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