Index: dietlibc-0.29/i386/start.S
===================================================================
--- dietlibc-0.29.orig/i386/start.S
+++ dietlibc-0.29/i386/start.S
@@ -50,7 +50,9 @@ _start:
 	PUT_VAR %edi, __vsyscall, %edx
 1:
 #endif
-
+#ifdef __dietlibc__
+	call	__guard_setup
+#endif
 #ifdef WANT_DYNAMIC
 	call	_dyn_start
 #else
Index: dietlibc-0.29/sparc/start.S
===================================================================
--- dietlibc-0.29.orig/sparc/start.S
+++ dietlibc-0.29/sparc/start.S
@@ -31,6 +31,9 @@ _start:
    be NULL.  */
 
 /* Let libc do the rest of the initialization, and call main.  */
+#if 0 /* FIXME: __dietlibc__ */
+	call    __guard_setup
+#endif
 #ifdef WANT_DYNAMIC
 	call	_dyn_start
 #else
Index: dietlibc-0.29/sparc64/start.S
===================================================================
--- dietlibc-0.29.orig/sparc64/start.S
+++ dietlibc-0.29/sparc64/start.S
@@ -31,6 +31,9 @@ _start:
    be NULL.  */
 
 /* Let libc do the rest of the initialization, and call main.  */
+#if 0 /* FIXME: __dietlibc__ */
+	call    __guard_setup
+#endif
 #ifdef WANT_DYNAMIC
 	call	_dyn_start
 #else
Index: dietlibc-0.29/x86_64/start.S
===================================================================
--- dietlibc-0.29.orig/x86_64/start.S
+++ dietlibc-0.29/x86_64/start.S
@@ -35,6 +35,10 @@ _start:
 	popq	%rdi
 #endif
 
+#if 0 /* FIXME: __dietlibc__ */
+	call	__guard_setup
+#endif
+
 #ifdef WANT_DYNAMIC
 	call	_dyn_start
 #else