From d7ad2d9bad88dd2ef4498cded81b3e2adca68af8 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Fri, 3 Jan 2014 13:22:19 -0600
Subject: [PATCH] PowerPC: Fix compiler warnings

This patch fixes some compile warnings related to extra tokens at
end of #undef directive from multilib patchset.
---
 ChangeLog                                                 | 8 ++++++++
 sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S   | 2 +-
 sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S | 2 +-
 sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S      | 2 +-
 sysdeps/powerpc/powerpc64/multiarch/wcscpy.c              | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5c4ffa7..74ffbff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-01-03  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+	* sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S: Remove
+	extra tokens at end of #undef directive.
+	* sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S: Likewise.
+	* sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S: Likewise.
+	* sysdeps/powerpc/powerpc64/multiarch/wcscpy.c: Likewise.
+
 2014-01-03  Andrew Hunter  <ahh@google.com>
 
 	* elf/dl-open.c (): New comment.
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S
index 0492baf..ad00f98 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S
@@ -33,7 +33,7 @@
   TRACEBACK(__strcasecmp_power7)				\
   END_2(__strcasecmp_power7)
 
-#undef weak_alias(name, alias)
+#undef weak_alias
 #define weak_alias(name, alias)
 
 #undef libc_hidden_builtin_def
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
index a65949f..81ec696 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S
@@ -33,7 +33,7 @@
   TRACEBACK(__strcasecmp_l_power7)				\
   END_2(__strcasecmp_l_power7)
 
-#undef weak_alias(name, alias)
+#undef weak_alias
 #define weak_alias(name, alias)
 
 #undef libc_hidden_builtin_def
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S
index 30e29cd..057e5a8 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S
+++ b/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S
@@ -35,7 +35,7 @@
 
 #undef libc_hidden_builtin_def
 #define libc_hidden_builtin_def(name)
-#undef weak_alias(name, alias)
+#undef weak_alias
 #define weak_alias(name, alias)
 
 #include <sysdeps/powerpc/powerpc64/power7/strnlen.S>
diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c b/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
index f04298a..5c0a6d3 100644
--- a/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
+++ b/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c
@@ -33,4 +33,4 @@ libc_ifunc (wcscpy,
              : __wcscpy_ppc);
 #else
 #include <wcsmbs/wcscpy.c>
-#endif:
+#endif
-- 
2.7.4