summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-11-13 23:27:23 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-11-13 23:27:23 +0100
commit19a696d410c8f2839ad4617ad8446fc3781ae684 (patch)
tree7778e970f676a3866a8c720d6e045bc1b95868b7
parent12f79e597feb33e0321c49f7bc2f2ad2ff904b02 (diff)
parent49a67cf67d5a7194214566bc730ee7e28d55bbe1 (diff)
Merge remote-tracking branch 'origin/upstream'
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
index e61072eb8..861ae9e64 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
@@ -17,4 +17,4 @@ libc_linux_arch_SSRC-OMIT = waitpid.S
# We always compile it in arm mode because of SAVE_PID macro
# This macro should be alternatively implemented in THUMB
# assembly.
-ASFLAGS-vfork.S = -marm
+ASFLAGS-pt-vfork.S = -marm