x86: Modify ENTRY in sysdep.h so that p2align can be specified

No bug.

This change adds a new macro ENTRY_P2ALIGN which takes a second
argument, log2 of the desired function alignment.

The old ENTRY(name) macro is just ENTRY_P2ALIGN(name, 4) so this
doesn't affect any existing functionality.

Signed-off-by: Noah Goldstein <goldstein.w.n@gmail.com>

diff --git a/sysdeps/x86/sysdep.h b/sysdeps/x86/sysdep.h
index cac1d762fb3f99d0954c955781bc13da888cda5a..937180c1bd791570c3b87fcb0bccd33d8a0e2537 100644 (file)
--- a/sysdeps/x86/sysdep.h
+++ b/sysdeps/x86/sysdep.h
@@ -78,15 +78,18 @@ enum cf_protection_level
 #define ASM_SIZE_DIRECTIVE(name) .size name,.-name;
 
 /* Define an entry point visible from C.  */
-#define        ENTRY(name)                                                           \
+#define        ENTRY_P2ALIGN(name, alignment)                                        \
   .globl C_SYMBOL_NAME(name);                                                \
   .type C_SYMBOL_NAME(name),@function;                                       \
-  .align ALIGNARG(4);                                                        \
+  .align ALIGNARG(alignment);                                                \
   C_LABEL(name)                                                                      \
   cfi_startproc;                                                             \
   _CET_ENDBR;                                                                \
   CALL_MCOUNT
 
+/* Common entry 16 byte aligns.  */
+#define ENTRY(name) ENTRY_P2ALIGN (name, 4)
+
 #undef END
 #define END(name)                                                            \
   cfi_endproc;                                                               \