diff -Nrup dietlibc-0.26.orig/i386/start.S dietlibc-0.26/i386/start.S
--- dietlibc-0.26.orig/i386/start.S	2003-04-17 09:55:39.000000000 -0400
+++ dietlibc-0.26/i386/start.S	2004-08-07 18:50:52.000000000 -0400
@@ -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
diff -Nrup dietlibc-0.26.orig/sparc/start.S dietlibc-0.26/sparc/start.S
--- dietlibc-0.26.orig/sparc/start.S	2003-08-22 08:16:23.000000000 -0400
+++ dietlibc-0.26/sparc/start.S	2004-08-07 18:55:26.000000000 -0400
@@ -29,6 +29,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
diff -Nrup dietlibc-0.26.orig/sparc64/start.S dietlibc-0.26/sparc64/start.S
--- dietlibc-0.26.orig/sparc64/start.S	2003-08-22 08:16:23.000000000 -0400
+++ dietlibc-0.26/sparc64/start.S	2004-08-07 18:55:36.000000000 -0400
@@ -29,6 +29,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
diff -Nrup dietlibc-0.26.orig/x86_64/start.S dietlibc-0.26/x86_64/start.S
--- dietlibc-0.26.orig/x86_64/start.S	2003-02-05 09:29:19.000000000 -0500
+++ dietlibc-0.26/x86_64/start.S	2004-08-07 18:52:39.000000000 -0400
@@ -35,6 +35,10 @@ _start:
 	popq	%rdi
 #endif
 
+#if 0 /* FIXME: __dietlibc__ */
+	call	__guard_setup
+#endif
+
 #ifdef WANT_DYNAMIC
 	call	_dyn_start
 #else