base/permute.h, utils/permute.lisp, symm/...: Formalize bit permutations.

[catacomb] / base / asm-common.h

diff --git a/base/asm-common.h b/base/asm-common.h
index fdf90ec..b4d4a90 100644 (file)
--- a/base/asm-common.h
+++ b/base/asm-common.h
@@ -45,15 +45,6 @@
 #define _ENDLIT .text .L$_subsec
 #define _LTORG .L$_subsec = .L$_subsec + 2; .text .L$_subsec
 
-// ELF section types.
-#if __ELF__
-#  if CPUFAM_ARMEL
-#    define _SECTTY(ty) %ty
-#  else
-#    define _SECTTY(ty) @ty
-#  endif
-#endif
-
 // Announcing an internal function.
 #define INTFUNC(name)                                                  \
        TYPE_FUNC(name);                                                \
@@ -95,9 +86,11 @@ name:
 
 #if __ELF__
 
-// Special arrangements for position-independent code.
-#if __PIC__ || __PIE__
-#  define WANT_PIC 1
+// Section types.
+#if CPUFAM_ARMEL
+#  define _SECTTY(ty) %ty
+#else
+#  define _SECTTY(ty) @ty
 #endif
 
 // Section selection.
@@ -108,6 +101,17 @@ name:
 #define TYPE_OBJ(name) .type name, STT_OBJECT
 #define SIZE_OBJ(name) .size name, . - name
 
+// Special arrangements for position-independent code.
+#if __PIC__ || __PIE__
+#  define WANT_PIC 1
+#endif
+
+// Don't make the stack executable by default.
+#ifndef FORCE_EXECUTABLE_STACK
+       .pushsection .note.GNU-stack, "", _SECTTY(progbits)
+       .popsection
+#endif
+
 #endif
 
 ///--------------------------------------------------------------------------
@@ -1211,11 +1215,6 @@ name:
 #  define SIZE_OBJ(name)
 #endif
 
-#if __ELF__ && !defined(FORCE_EXECUTABLE_STACK)
-       .pushsection .note.GNU-stack, "", _SECTTY(progbits)
-       .popsection
-#endif
-
 ///----- That's all, folks --------------------------------------------------
 
 #endif