summaryrefslogtreecommitdiff
path: root/libpthread/nptl/sysdeps/i386
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-11-28 21:09:47 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-11-28 21:09:47 +0100
commit57f6cce72c889f2e7b342e87a565a064320a6ee2 (patch)
tree5466406472918d3adb63398f5fb9ea1511a5e73f /libpthread/nptl/sysdeps/i386
parent4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119 (diff)
parent5dea871ac73ef4608022c058b50adc946917f9b9 (diff)
Merge commit 'origin/master' into prelink
Conflicts: ldso/include/dl-hash.h Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/nptl/sysdeps/i386')
-rw-r--r--libpthread/nptl/sysdeps/i386/Makefile.arch1
1 files changed, 0 insertions, 1 deletions
diff --git a/libpthread/nptl/sysdeps/i386/Makefile.arch b/libpthread/nptl/sysdeps/i386/Makefile.arch
index 89962f743..957230384 100644
--- a/libpthread/nptl/sysdeps/i386/Makefile.arch
+++ b/libpthread/nptl/sysdeps/i386/Makefile.arch
@@ -8,4 +8,3 @@
CFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE
CFLAGS-pthread_create.c += -mpreferred-stack-boundary=4
-CFLAGS-i386 = $(SSP_ALL_CFLAGS)