[git commit nptl] undef INTERNAL_SYSCALL_NCS before redefining to quash build warnings.

[Khem Raj]

commit: http://git.uclibc.org/uClibc/commit/?id=d57e6548d253a9efed91d72498aeda092fa265d2
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

Pass LDFLAGS using -Wl now gcc is used as LD.

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 libpthread/nptl/Makefile.in                        |    2 +-
 .../nptl/sysdeps/unix/sysv/linux/arm/sysdep.h      |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
index 350d649..e5ddab3 100644
--- a/libpthread/nptl/Makefile.in
+++ b/libpthread/nptl/Makefile.in
@@ -204,7 +204,7 @@ libpthread-misc-routines = pthread_rwlock_rdlock pthread_rwlock_timedrdlock \
 			   unwind-forcedunwind
 
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -z defs
+LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
 else
 LDFLAGS-libpthread.so := $(LDFLAGS)
 endif
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h
index 11f81b0..d62c385 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/sysdep.h
@@ -305,11 +305,13 @@ __local_syscall_error:						\
 #define ASM_ARGS_7	ASM_ARGS_6, "r" (_v3)
 
 #if defined(__ARM_EABI__)
+#undef INTERNAL_SYSCALL_NCS
 #define INTERNAL_SYSCALL_NCS(number, err, nr, args...)		\
 	INTERNAL_SYSCALL_RAW(number, err, nr, args)
 #else
 /* We can't implement non-constant syscalls directly since the syscall
    number is normally encoded in the instruction.  So use SYS_syscall.  */
+#undef INTERNAL_SYSCALL_NCS
 #define INTERNAL_SYSCALL_NCS(number, err, nr, args...)		\
 	INTERNAL_SYSCALL_NCS_##nr (number, err, args)
 
-- 
1.6.3.3