From 96a157490c8db4c3be4495c4f9c0ca9ecaf5ae7c Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 12 Feb 2015 13:57:32 -0800
Subject: [PATCH] Use -Werror=undef for assembly code.

---
 ChangeLog                     |  5 +++++
 Makeconfig                    |  2 +-
 sysdeps/arm/Versions          |  4 ++++
 sysdeps/unix/make-syscalls.sh | 12 ++++--------
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd06443462..ce62001b06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2015-02-12  Roland McGrath  <roland@hack.frob.com>
 
+	* Makeconfig (ASFLAGS): Add -Werror=undef.
+	* sysdeps/arm/Versions (libc: GLIBC_2.19): New (empty) version set.
+	* sysdeps/unix/make-syscalls.sh: Always emit #define's for
+	SYSCALL_CANCELLABLE, SYSCALL_NOERRNO, SYSCALL_ERRVAL, to 1 or 0.
+
 	* Makeconfig (after-link): New variable.
 	(+link-pie, +link-pie-tests): Use it.
 	(+link-static, +link-static-tests): Likewise.
diff --git a/Makeconfig b/Makeconfig
index 1e03481b9d..509b5bd3df 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -948,7 +948,7 @@ endif
 ifndef ASFLAGS
 ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))
 endif
-ASFLAGS += $(ASFLAGS-config) $(asflags-cpu)
+ASFLAGS += -Werror=undef $(ASFLAGS-config) $(asflags-cpu)
 
 ifndef BUILD_CC
 BUILD_CC = $(CC)
diff --git a/sysdeps/arm/Versions b/sysdeps/arm/Versions
index 5f2af29c38..f26a1a7606 100644
--- a/sysdeps/arm/Versions
+++ b/sysdeps/arm/Versions
@@ -17,4 +17,8 @@ libc {
   GLIBC_2.8 {
     __gnu_mcount_nc;
   }
+  GLIBC_2.19 {
+    # This set has to exist in some Versions file so we can use 2.19 in
+    # SHLIB_COMPAT.  Since it didn't exist anywhere else, we add it here.
+  }
 }
diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh
index 567081a624..e3596b6ce3 100644
--- a/sysdeps/unix/make-syscalls.sh
+++ b/sysdeps/unix/make-syscalls.sh
@@ -250,14 +250,10 @@ while read file srcfile caller syscall args strong weak; do
 	\$(make-target-directory)
 	(echo '#define SYSCALL_NAME $syscall'; \\
 	 echo '#define SYSCALL_NARGS $nargs'; \\
-	 echo '#define SYSCALL_SYMBOL $strong'; \\"
-  [ $cancellable = 0 ] || echo "\
-	 echo '#define SYSCALL_CANCELLABLE 1'; \\"
-  [ $noerrno = 0 ] || echo "\
-	 echo '#define SYSCALL_NOERRNO 1'; \\"
-  [ $errval = 0 ] || echo "\
-	 echo '#define SYSCALL_ERRVAL 1'; \\"
-  echo "\
+	 echo '#define SYSCALL_SYMBOL $strong'; \\
+	 echo '#define SYSCALL_CANCELLABLE $cancellable'; \\
+	 echo '#define SYSCALL_NOERRNO $noerrno'; \\
+	 echo '#define SYSCALL_ERRVAL $errval'; \\
 	 echo '#include <syscall-template.S>'; \\"
   ;;
   esac
-- 
2.11.4.GIT