Skip to content

Commit

Permalink
Merge branch 'fedora/master' of sourceware.org:/git/glibc into fedora…
Browse files Browse the repository at this point in the history
…/master

Conflicts:
	fedora/glibc.spec.in
  • Loading branch information
Andreas Schwab committed Aug 28, 2009
2 parents 02766bf + 26e1d33 commit 62f946a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion fedora/glibc.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
Release: 16
Release: 17
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
Expand Down Expand Up @@ -348,6 +348,7 @@ build_CFLAGS="$BuildFlags -g -O3 $*"
--enable-multi-arch \
%endif
--disable-profile --enable-experimental-malloc --enable-nss-crypt

make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s

cd ..
Expand Down Expand Up @@ -1025,6 +1026,9 @@ rm -f *.filelist*
%endif

%changelog
* Thu Aug 27 2009 Roland McGrath <roland@redhat.com> - 2.10.90-17
- Update from master.

* Wed Aug 26 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-16
- Update from master.
- handle AVX saving on x86-64 in interrupted symbol lookups (#519081).
Expand Down

0 comments on commit 62f946a

Please sign in to comment.