diff --git a/lib/csu/amd64/crti.S b/lib/csu/amd64/crti.S
--- a/lib/csu/amd64/crti.S
+++ b/lib/csu/amd64/crti.S
@@ -31,13 +31,15 @@
 	.globl	_init
 	.type	_init,@function
 _init:
-	subq	$8,%rsp
+	pushq	%rbp
+	movq	%rsp,%rbp
 
 	.section .fini,"ax",@progbits
 	.align	4
 	.globl	_fini
 	.type	_fini,@function
 _fini:
-	subq	$8,%rsp
+	pushq	%rbp
+	movq	%rsp,%rbp
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/csu/amd64/crtn.S b/lib/csu/amd64/crtn.S
--- a/lib/csu/amd64/crtn.S
+++ b/lib/csu/amd64/crtn.S
@@ -27,11 +27,11 @@
 __FBSDID("$FreeBSD$");
 
 	.section .init,"ax",@progbits
-	addq	$8,%rsp
+	popq	%rbp
 	ret
 
 	.section .fini,"ax",@progbits
-	addq	$8,%rsp
+	popq	%rbp
 	ret
 
 	.section .note.GNU-stack,"",%progbits