From ac7735e01fe93039285c6f26916f1382209a65e5 Mon Sep 17 00:00:00 2001
From: wernsaar <wernsaar@googlemail.com>
Date: Sun, 1 Dec 2013 11:05:10 +0100
Subject: [PATCH] merge from develop

---
 common_x86.h    | 15 +--------------
 common_x86_64.h | 10 ----------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/common_x86.h b/common_x86.h
index 8245f7078..5f42843be 100644
--- 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 4fe23448f..39e5a5eb1 100644
--- 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