rpms
/
glibc
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync with upstream master 

Fix up glibc-fedora-uname-getrlimit.patch to apply on top of recent
nptl code shuffle.
This commit is contained in:
Siddhesh Poyarekar 2014-05-15 12:26:54 +05:30
parent 647ffb77fa
commit 25cc20651e
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
glibc-fedora-uname-getrlimit.patch
View File

@ -13,17 +13,17 @@ GLIBC_PRIVATE.
ChangeLog | 8 ++++++++ ChangeLog | 8 ++++++++
nptl/Versions | 1 + nptl/Versions | 1 +
nptl/nptl-init.c | 2 +- nptl/nptl-init.c | 2 +-
nptl/sysdeps/unix/sysv/linux/i386/Versions | 6 ++++++ sysdeps/unix/sysv/linux/i386/Versions | 6 ++++++
nptl/sysdeps/unix/sysv/linux/i386/smp.h | 2 +- sysdeps/unix/sysv/linux/i386/smp.h | 2 +-
5 files changed, 17 insertions(+), 2 deletions(-) 5 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 nptl/sysdeps/unix/sysv/linux/i386/Versions create mode 100644 sysdeps/unix/sysv/linux/i386/Versions
--- a/nptl/Version --- a/nptl/Version
+++ b/nptl/Versions +++ b/nptl/Versions
@@ -30,6 +30,7 @@ libc { @@ -30,6 +30,7 @@ libc {
__libc_alloca_cutoff;
# Internal libc interface to libpthread # Internal libc interface to libpthread
__libc_dl_error_tsd; __libc_dl_error_tsd;
__libc_vfork;
+ __getrlimit; + __getrlimit;
} }
} }
@ -39,17 +39,17 @@ GLIBC_PRIVATE.
|| limit.rlim_cur == RLIM_INFINITY) || limit.rlim_cur == RLIM_INFINITY)
/* The system limit is not usable. Use an architecture-specific /* The system limit is not usable. Use an architecture-specific
default. */ default. */
--- a/nptl/sysdeps/unix/sysv/linux/i386/Versions --- a/sysdeps/unix/sysv/linux/i386/Versions
+++ b/nptl/sysdeps/unix/sysv/linux/i386/Versions +++ b/sysdeps/unix/sysv/linux/i386/Versions
@@ -0,0 +1,6 @@ @@ -53,5 +53,6 @@
+libc { }
+ GLIBC_PRIVATE { GLIBC_PRIVATE {
+ # Internal libc interface to libpthread __modify_ldt;
+ __uname; + __uname;
+ } }
+} }
--- a/nptl/sysdeps/unix/sysv/linux/i386/smp.h --- a/sysdeps/unix/sysv/linux/i386/smp.h
+++ b/nptl/sysdeps/unix/sysv/linux/i386/smp.h +++ b/sysdeps/unix/sysv/linux/i386/smp.h
@@ -36,7 +36,7 @@ is_smp_system (void) @@ -36,7 +36,7 @@ is_smp_system (void)
char *cp; char *cp;

7
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.19-323-g5abebba %define glibcsrcdir glibc-2.19-418-ga5d87b3
%define glibcversion 2.19.90 %define glibcversion 2.19.90
%define glibcrelease 14%{?dist} %define glibcrelease 15%{?dist}
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -1642,6 +1642,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Thu May 15 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.19.90-15
- Sync with upstream master.
* Wed May 14 2014 Carlos O'Donell <carlos@redhat.com> - 2.19.90-14 * Wed May 14 2014 Carlos O'Donell <carlos@redhat.com> - 2.19.90-14
- Add support for displaying all test results in build logs. - Add support for displaying all test results in build logs.

2
sources
View File

@ -1 +1 @@
411c3154a69ae3d4ca7f1a4f2866ef62 glibc-2.19-323-g5abebba.tar.gz 597f972539723b3d709781c408400558 glibc-2.19-418-ga5d87b3.tar.gz