diff options
| -rw-r--r-- | libpthread/nptl/Makefile.in | 2 | ||||
| -rw-r--r-- | libpthread/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 350d64902..e5ddab317 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 11f81b0b1..d62c385e4 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) |