diff --git a/ChangeLog b/ChangeLog
index 90a948b482..f43cb09c9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-11-26  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/unix/sysv/linux/arm/libc-do-syscall.S (_FORTIFY_SOURCE):
+	Undefine.
+
 	[BZ #16619]
 	[BZ #16740]
 	* sysdeps/ieee754/ldbl-128ibm/s_frexpl.c (__frexpl): Use 1LL << 52
diff --git a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
index d42a94a560..78e997c627 100644
--- a/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
+++ b/sysdeps/unix/sysv/linux/arm/libc-do-syscall.S
@@ -15,6 +15,9 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+/* When this file is built for inclusion in nscd, _FORTIFY_SOURCE is
+   defined but -O is not used, resulting in a warning from features.h.  */
+#undef _FORTIFY_SOURCE
 #include <sysdep.h>
 
 /* Out-of-line syscall stub.  We expect the system call number in ip