Author: kib
Date: Wed Nov 2 18:08:30 2011
New Revision: 227024
URL: http://svn.freebsd.org/changeset/base/227024
Log:
Despite official i386 ABI does not mandate any stack alignment besides
the word alignment, some versions of gcc do require 16-byte alignment.
Make sure the stack is 16-byte aligned before calling a subroutine.
Inspired by: PR amd64/162214
MFC after: 1 week
Modified:
head/lib/libc/i386/gen/setjmp.S
head/lib/libc/i386/gen/sigsetjmp.S
Modified: head/lib/libc/i386/gen/setjmp.S
==============================================================================
--- head/lib/libc/i386/gen/setjmp.S Wed Nov 2 18:06:22 2011
(r227023)
+++ head/lib/libc/i386/gen/setjmp.S Wed Nov 2 18:08:30 2011
(r227024)
@@ -51,12 +51,19 @@ __FBSDID("$FreeBSD$");
ENTRY(setjmp)
movl 4(%esp),%ecx
PIC_PROLOGUE
+#ifdef PIC
+ subl $12,%esp /* make the stack 16-byte aligned */
+#endif
leal 28(%ecx), %eax
pushl %eax /* (sigset_t*)oset */
pushl $0 /* (sigset_t*)set */
pushl $1 /* SIG_BLOCK */
call PIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+ addl $24,%esp
+#else
addl $12,%esp
+#endif
PIC_EPILOGUE
movl 4(%esp),%ecx
movl 0(%esp),%edx
@@ -76,12 +83,19 @@ END(setjmp)
ENTRY(__longjmp)
movl 4(%esp),%edx
PIC_PROLOGUE
+#ifdef PIC
+ subl $12,%esp /* make the stack 16-byte aligned */
+#endif
pushl $0 /* (sigset_t*)oset */
leal 28(%edx), %eax
pushl %eax /* (sigset_t*)set */
pushl $3 /* SIG_SETMASK */
call PIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+ addl $24,%esp
+#else
addl $12,%esp
+#endif
PIC_EPILOGUE
movl 4(%esp),%edx
movl 8(%esp),%eax
Modified: head/lib/libc/i386/gen/sigsetjmp.S
==============================================================================
--- head/lib/libc/i386/gen/sigsetjmp.S Wed Nov 2 18:06:22 2011
(r227023)
+++ head/lib/libc/i386/gen/sigsetjmp.S Wed Nov 2 18:08:30 2011
(r227024)
@@ -60,12 +60,19 @@ ENTRY(sigsetjmp)
testl %eax,%eax
jz 2f
PIC_PROLOGUE
+#ifdef PIC
+ subl $12,%esp /* make the stack 16-byte aligned */
+#endif
leal 28(%ecx), %eax
pushl %eax /* (sigset_t*)oset */
pushl $0 /* (sigset_t*)set */
pushl $1 /* SIG_BLOCK */
call PIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+ addl $24,%esp
+#else
addl $12,%esp
+#endif
PIC_EPILOGUE
movl 4(%esp),%ecx
2: movl 0(%esp),%edx
@@ -87,12 +94,19 @@ ENTRY(__siglongjmp)
cmpl $0,44(%edx)
jz 2f
PIC_PROLOGUE
+#ifdef PIC
+ subl $12,%esp /* make the stack 16-byte aligned */
+#endif
pushl $0 /* (sigset_t*)oset */
leal 28(%edx), %eax
pushl %eax /* (sigset_t*)set */
pushl $3 /* SIG_SETMASK */
call PIC_PLT(CNAME(_sigprocmask))
+#ifdef PIC
+ addl $24,%esp
+#else
addl $12,%esp
+#endif
PIC_EPILOGUE
movl 4(%esp),%edx
2: movl 8(%esp),%eax
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
