From e0f3e2900b313d17fc7630a964e1458e837b4ad1 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Mon, 16 Sep 2013 09:51:24 +0200
Subject: [PATCH] Changed alignment.

---
 common/system/jump_x86_64_sysv_elf_gas.S |  2 +-
 common/system/make_x86_64_sysv_elf_gas.S | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/common/system/jump_x86_64_sysv_elf_gas.S b/common/system/jump_x86_64_sysv_elf_gas.S
index 40b65d7db6..c22f6e8038 100644
--- a/common/system/jump_x86_64_sysv_elf_gas.S
+++ b/common/system/jump_x86_64_sysv_elf_gas.S
@@ -41,7 +41,7 @@
 .text
 .globl jump_fcontext
 .type jump_fcontext,@function
-.align 16
+.align 8
 jump_fcontext:
     movq     %rbx,       (%rdi)         /* save RBX */
     movq     %r12,       0x8(%rdi)      /* save R12 */
diff --git a/common/system/make_x86_64_sysv_elf_gas.S b/common/system/make_x86_64_sysv_elf_gas.S
index ba040d0519..188cc931e5 100644
--- a/common/system/make_x86_64_sysv_elf_gas.S
+++ b/common/system/make_x86_64_sysv_elf_gas.S
@@ -40,8 +40,12 @@
 
 .text
 .globl make_fcontext
+
+#ifndef  __APPLE__
 .type make_fcontext,@function
-.align 16
+#endif
+
+.align 8
 make_fcontext:
     leaq   -0x58(%rdi),    %rax        /* reserve space for fcontext_t at top of context stack */
 
@@ -70,5 +74,8 @@ finish:
     xorq    %rdi,           %rdi       /* exit code is zero */
     call   _exit@PLT                   /* exit application */
     hlt
-.size make_fcontext,.-make_fcontext
+
+#ifndef  __APPLE__
+.size make_fcontext,.-make_fcontext
+#endif