diff --git a/src/system/libroot/stubbed/libroot_stubs.c b/src/system/libroot/stubbed/libroot_stubs.c
index bd06db4de3..6fcce6135c 100644
--- a/src/system/libroot/stubbed/libroot_stubs.c
+++ b/src/system/libroot/stubbed/libroot_stubs.c
@@ -2739,6 +2739,8 @@ void srand48() {}
 void srand48_r() {}
 void srandom() {}
 void srandom_r() {}
+void __stack_chk_fail() {}
+void __stack_chk_fail_local() {}
 void sscanf() {}
 void statvfs() {}
 void stime() {}
diff --git a/src/tests/system/libroot/os/Jamfile b/src/tests/system/libroot/os/Jamfile
index b6028376e9..91034ef79a 100644
--- a/src/tests/system/libroot/os/Jamfile
+++ b/src/tests/system/libroot/os/Jamfile
@@ -30,10 +30,14 @@ SimpleTest get_cpu_num_test :
 
 
 CCFLAGS += -fstack-protector ;
-SimpleTest stack_protector_test :
-	stack_protector_test.c
-;
-
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		SimpleTest [ MultiArchDefaultGristFiles stack_protector_test ] :
+			stack_protector_test.c
+		;
+	}
+}
 
 
 # Tell Jam where to find these sources