diff --git a/ChangeLog b/ChangeLog
index 8d5d684950..52fd1d90bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-07-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* debug/Makefile (CFLAGS-tst-ssp-1.c): Set to
+	-fstack-protector-all.
+
 2017-07-11  Chris Leonard <cjl@sugarlabs.org>
 
 	[BZ #20496]
diff --git a/debug/Makefile b/debug/Makefile
index c6d78727f0..ce5fa8801f 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -139,7 +139,7 @@ LDFLAGS-tst-backtrace4 = -rdynamic
 LDFLAGS-tst-backtrace5 = -rdynamic
 LDFLAGS-tst-backtrace6 = -rdynamic
 
-CFLAGS-tst-ssp-1.c = -fstack-protector
+CFLAGS-tst-ssp-1.c = -fstack-protector-all
 
 tests = backtrace-tst tst-longjmp_chk tst-chk1 tst-chk2 tst-chk3 \
 	tst-lfschk1 tst-lfschk2 tst-lfschk3 test-strcpy_chk test-stpcpy_chk \