diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
commit | b32e36625b44b5c002c417ab4faf6311258c7671 (patch) | |
tree | 87f91f6f7d9ccb229f9c7613f5411534bd504f5e /staging/glibc/glibc-2.15-arena.patch | |
parent | 1a274201c465801ed2271018f426f0eaf7098215 (diff) | |
parent | 35c30674b2b901077a809a6f1d8e5a0115098c8b (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mplayer2/PKGBUILD
community/pcmanfm/PKGBUILD
extra/liblrdf/PKGBUILD
extra/php-apc/PKGBUILD
extra/sqlite/PKGBUILD
kde-unstable/libkgapi/PKGBUILD
kde-unstable/soprano/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
Diffstat (limited to 'staging/glibc/glibc-2.15-arena.patch')
-rw-r--r-- | staging/glibc/glibc-2.15-arena.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/staging/glibc/glibc-2.15-arena.patch b/staging/glibc/glibc-2.15-arena.patch deleted file mode 100644 index 46f52e98d..000000000 --- a/staging/glibc/glibc-2.15-arena.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/malloc/arena.c b/malloc/arena.c -index d3cf4b9..b1c9469 100644 ---- a/malloc/arena.c -+++ b/malloc/arena.c -@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size) - { - if (mp_.arena_max != 0) - narenas_limit = mp_.arena_max; -- else -+ else if (narenas > mp_.arena_test) - { - int n = __get_nprocs (); - -@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size) - } - repeat:; - size_t n = narenas; -- if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0)) -+ /* NB: the following depends on the fact that (size_t)0 - 1 is a -+ very large number and that the underflow is OK. If arena_max -+ is set the value of arena_test is irrelevant. If arena_test -+ is set but narenas is not yet larger or equal to arena_test -+ narenas_limit is 0. There is no possibility for narenas to -+ be too big for the test to always fail since there is not -+ enough address space to create that many arenas. */ -+ if (__builtin_expect (n <= narenas_limit - 1, 0)) - { - if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n)) - goto repeat; |