Sync with upstream master

glibc-bench-build.patch

@@ -30,7 +30,7 @@ index fd3036d..7cbceaa 100644
 +++ b/benchtests/Makefile
 @@ -103,6 +103,10 @@ bench-clean:
  
- bench: $(timing-type) bench-set bench-func bench-malloc
+ bench: $(timing-type) $(gen-locales) bench-set bench-func bench-malloc
  
 +bench-build: bench-set-build bench-func-build
 +bench-set-build: $(binaries-benchset)

glibc-fedora-localedef.patch

@@ -7,5 +7,5 @@ diff -Nrup a/localedata/Makefile b/localedata/Makefile
  	$(LOCALEDEF) --alias-file=../intl/locale.alias \
 +		     --no-archive \
  		     -i locales/$$input -c -f charmaps/$$charset \
- 		     $(addprefix --prefix=,$(install_root)) $$locale; \
- 	echo ' done'; \
+ 		     $(addprefix --prefix=,$(install_root)) $$locale \
+ 	&& echo ' done'; \

glibc.spec

@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.21-320-ga6d78c3
+%define glibcsrcdir  glibc-2.21-357-gb40a4e1
 %define glibcversion 2.21.90
-%define glibcrelease 12%{?dist}
+%define glibcrelease 13%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -1817,6 +1817,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon May 18 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.21.90-13
+- Sync with upstream master.
+
 * Fri May 08 2015 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.21.90-12
 - Add benchmark comparison scripts.
 

sources

@@ -1 +1 @@
-a98e79a6a741f842fd1505e54b5face8  glibc-2.21-320-ga6d78c3.tar.gz
+ab8cde6d7c2bb3cfc9da616fb5cf2323  glibc-2.21-357-gb40a4e1.tar.gz