diff --git a/ChangeLog.arm b/ChangeLog.arm
index d7217bb462..3f510d29e1 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,8 @@
+2006-03-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/arm/eabi/Makefile (arm-using-eabi): Set.
+	* sysdeps/unix/sysv/linux/arm/nptl/Makefile: New file.
+
 2006-02-28  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* sysdeps/unix/arm/sysdep.h, sysdeps/unix/sysv/linux/arm/sysdep.S,
diff --git a/sysdeps/unix/sysv/linux/arm/eabi/Makefile b/sysdeps/unix/sysv/linux/arm/eabi/Makefile
index d3c02a2dea..9f2b0fe8f4 100644
--- a/sysdeps/unix/sysv/linux/arm/eabi/Makefile
+++ b/sysdeps/unix/sysv/linux/arm/eabi/Makefile
@@ -1,3 +1,6 @@
+# Set this flag here so that arm/nptl/Makefile will see it.
+arm-using-eabi = yes
+
 ifeq ($(subdir),csu)
 # In order for unwinding to fail when it falls out of main, we need a
 # cantunwind marker.  There's one in start.S.  To make sure we reach it, add
diff --git a/sysdeps/unix/sysv/linux/arm/nptl/Makefile b/sysdeps/unix/sysv/linux/arm/nptl/Makefile
new file mode 100644
index 0000000000..f270f19435
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/arm/nptl/Makefile
@@ -0,0 +1,8 @@
+ifeq ($(subdir),nptl)
+ifneq ($(arm-using-eabi),yes)
+# These tests rely on PTHREAD_KEYS_MAX.  The SJLJ exception machinery
+# in libgcc registers one key, however, so only PTHREAD_KEYS_MAX-1
+# keys are available.  This works fine for EABI targets.
+tests := $(filter-out tst-key1 tst-key4,$(tests))
+endif
+endif