diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix
index a8cb4f2b1d05..3876cf237c8c 100644
--- a/pkgs/development/libraries/glibc/2.16/common.nix
+++ b/pkgs/development/libraries/glibc/2.16/common.nix
@@ -114,19 +114,9 @@ stdenv.mkDerivation ({
           && cross.platform.kernelMajor == "2.6") [
       "--enable-kernel=2.6.0"
       "--with-__thread"
-    ] ++ stdenv.lib.optionals (cross == null &&
-         (stdenv.system == "armv5tel-linux")) [
+    ] ++ stdenv.lib.optionals (cross == null && stdenv.isArm) [
       "--host=arm-linux-gnueabi"
       "--build=arm-linux-gnueabi"
-      "--without-fp"
-
-      # To avoid linking with -lgcc_s (dynamic link)
-      # so the glibc does not depend on its compiler store path
-      "libc_cv_as_needed=no"
-    ] ++ stdenv.lib.optionals (cross == null && stdenv.platform.name == "raspberrypi") [
-      "--host=arm-linux-gnueabi"
-      "--build=arm-linux-gnueabi"
-      "--with-fp"
 
       # To avoid linking with -lgcc_s (dynamic link)
       # so the glibc does not depend on its compiler store path