summaryrefslogtreecommitdiff
path: root/core/glibc
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2012-01-09 13:47:51 +0000
committerParabola <dev@list.parabolagnulinux.org>2012-01-09 13:47:51 +0000
commit7a3611f5caa5e34c1f2b582640f97b733110ae63 (patch)
tree5b0baf1ad1b36444ffbf73707a377b15fc67692f /core/glibc
parent46783b68621b6ad45cdd9ed64cfa8cdcfbc6f318 (diff)
Mon Jan 9 13:47:49 UTC 2012
Diffstat (limited to 'core/glibc')
-rw-r--r--core/glibc/glibc-2.12.1-static-shared-getpagesize.patch11
-rw-r--r--core/glibc/glibc-2.13-futex.patch31
-rw-r--r--core/glibc/glibc-2.14.1-tzfile-overflow.patch72
3 files changed, 0 insertions, 114 deletions
diff --git a/core/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/core/glibc/glibc-2.12.1-static-shared-getpagesize.patch
deleted file mode 100644
index e84754279..000000000
--- a/core/glibc/glibc-2.12.1-static-shared-getpagesize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
-@@ -28,7 +28,7 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
-+#if 0 && defined __ASSUME_AT_PAGESIZE
- assert (GLRO(dl_pagesize) != 0);
- return GLRO(dl_pagesize);
- #else
diff --git a/core/glibc/glibc-2.13-futex.patch b/core/glibc/glibc-2.13-futex.patch
deleted file mode 100644
index 9b9c3ac45..000000000
--- a/core/glibc/glibc-2.13-futex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
-
- 7: movq %rdx, %rax
-
--#ifndef __ASSUME_PRIVATE_FUTEX
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- addq $16, %rsp
- cfi_adjust_cfa_offset(-16)
- popq %r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
diff --git a/core/glibc/glibc-2.14.1-tzfile-overflow.patch b/core/glibc/glibc-2.14.1-tzfile-overflow.patch
deleted file mode 100644
index 9e21cbfd3..000000000
--- a/core/glibc/glibc-2.14.1-tzfile-overflow.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/time/tzfile.c b/time/tzfile.c
-index 144e20b..402389c 100644
---- a/time/tzfile.c
-+++ b/time/tzfile.c
-@@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
- goto read_again;
- }
-
-+ if (__builtin_expect (num_transitions
-+ > ((SIZE_MAX - (__alignof__ (struct ttinfo) - 1))
-+ / (sizeof (time_t) + 1)), 0))
-+ goto lose;
- total_size = num_transitions * (sizeof (time_t) + 1);
- total_size = ((total_size + __alignof__ (struct ttinfo) - 1)
- & ~(__alignof__ (struct ttinfo) - 1));
- types_idx = total_size;
-- total_size += num_types * sizeof (struct ttinfo) + chars;
-+ if (__builtin_expect (num_types
-+ > (SIZE_MAX - total_size) / sizeof (struct ttinfo), 0))
-+ goto lose;
-+ total_size += num_types * sizeof (struct ttinfo);
-+ if (__builtin_expect (chars > SIZE_MAX - total_size, 0))
-+ goto lose;
-+ total_size += chars;
-+ if (__builtin_expect (__alignof__ (struct leap) - 1
-+ > SIZE_MAX - total_size, 0))
-+ goto lose;
- total_size = ((total_size + __alignof__ (struct leap) - 1)
- & ~(__alignof__ (struct leap) - 1));
- leaps_idx = total_size;
-+ if (__builtin_expect (num_leaps
-+ > (SIZE_MAX - total_size) / sizeof (struct leap), 0))
-+ goto lose;
- total_size += num_leaps * sizeof (struct leap);
-- tzspec_len = (sizeof (time_t) == 8 && trans_width == 8
-- ? st.st_size - (ftello (f)
-- + num_transitions * (8 + 1)
-- + num_types * 6
-- + chars
-- + num_leaps * 12
-- + num_isstd
-- + num_isgmt) - 1 : 0);
-+ tzspec_len = 0;
-+ if (sizeof (time_t) == 8 && trans_width == 8)
-+ {
-+ off_t rem = st.st_size - ftello (f);
-+ if (__builtin_expect (rem < 0
-+ || (size_t) rem < (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars), 0))
-+ goto lose;
-+ tzspec_len = (size_t) rem - (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars);
-+ if (__builtin_expect (num_leaps > SIZE_MAX / 12
-+ || tzspec_len < num_leaps * 12, 0))
-+ goto lose;
-+ tzspec_len -= num_leaps * 12;
-+ if (__builtin_expect (tzspec_len < num_isstd, 0))
-+ goto lose;
-+ tzspec_len -= num_isstd;
-+ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
-+ goto lose;
-+ tzspec_len -= num_isgmt + 1;
-+ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))
-+ goto lose;
-+ }
-+ if (__builtin_expect (SIZE_MAX - total_size - tzspec_len < extra, 0))
-+ goto lose;
-
- /* Allocate enough memory including the extra block requested by the
- caller. */