diff -r 586e90e84d60 -r b687b05475c6 hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
--- a/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk	Thu Nov 26 09:50:22 2015 +0100
+++ b/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk	Fri Nov 27 10:37:44 2015 +0100
@@ -79,7 +79,7 @@
   SA_EXCLUDE_FILES := BsdDebuggerLocal.c ps_proc.c salibelf.c StubDebuggerLocal.c
   SA_CFLAGS := $(CFLAGS_JDKLIB) \
       -Damd64 -D_GNU_SOURCE -mno-omit-leaf-frame-pointer \
-      -mstack-alignment=1 -fPIC
+      -mstack-alignment=16 -fPIC
   SA_LDFLAGS := $(LDFLAGS_JDKLIB)
   SA_LIBS := -framework Foundation -framework JavaNativeFoundation \
       -framework Security -framework CoreFoundation