Index: SPECS/glibc.spec
===================================================================
--- SPECS.orig/glibc.spec
+++ SPECS/glibc.spec
@@ -4,7 +4,7 @@
 %define glibc_release_tarballs 0
 %define glibcversion 2.7
 %define glibcrelease 2.fa1
-%define run_glibc_tests 1
+%define run_glibc_tests 0
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -364,7 +364,7 @@ CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLA
 	--host %{nptl_target_cpu}-redhat-linux-gnueabi \
 %endif
 	--disable-profile
-make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
+make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS"
 
 cd ..
 }
@@ -413,7 +413,7 @@ GCC=`cat Gcc`
 
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
-make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s
+make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl
 %ifnarch %{auxarches}
 cd build-%{nptl_target_cpu}-linuxnptl && \
     make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \
@@ -740,7 +740,7 @@ export TIMEOUTFACTOR=16
 parent=$$
 echo ====================TESTING=========================
 cd build-%{nptl_target_cpu}-linuxnptl
-( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
+( make %{?_smp_mflags} -k check 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
@@ -749,7 +749,7 @@ cd ..
 %if %{buildxen}
 echo ====================TESTING -mno-tls-direct-seg-refs=============
 cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
-( make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1
+( make -j$numprocs -k check 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
@@ -762,7 +762,7 @@ cd build-%{nptl_target_cpu}-linuxnptl-po
 ( if [ -d ../power6emul ]; then
     export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so
   fi
-  make -j$numprocs -k check PARALLELMFLAGS=-s 2>&1
+  make -j$numprocs -k check 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid