Accepting request 72233 from Base:System

Update to glibc 2.13

OBS-URL: https://build.opensuse.org/request/show/72233
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=43

glibc-malloc-arena-max.diff

@@ -37,11 +37,11 @@ in extremely thread-intensive applications.
 	PER_THREAD.
 	* malloc/malloc.c: Remove redundant M_* defines.
 
-diff --git a/malloc/arena.c b/malloc/arena.c
-index 4d0deef..ea80724 100644
---- a/malloc/arena.c
-+++ b/malloc/arena.c
-@@ -78,8 +78,8 @@ extern int sanity_check_heap_info_alignment[(sizeof (heap_info)
+Index: glibc-2.13/malloc/arena.c
+===================================================================
+--- glibc-2.13.orig/malloc/arena.c
++++ glibc-2.13/malloc/arena.c
+@@ -78,8 +78,8 @@ extern int sanity_check_heap_info_alignm
  
  static tsd_key_t arena_key;
  static mutex_t list_lock;
@@ -83,15 +83,16 @@ index 4d0deef..ea80724 100644
    (void)mutex_unlock(&list_lock);
  #endif
  
-@@ -982,13 +980,9 @@ get_free_list (void)
+@@ -982,13 +980,10 @@ get_free_list (void)
    return result;
  }
  
 -
 -static mstate
 -reused_arena (void)
++static int get_narenas_limit (void) __attribute__((pure));
 +static int
-+get_narenas_limit (void) __attribute__((pure))
++get_narenas_limit (void)
  {
 -  if (narenas <= mp_.arena_test)
 -    return NULL;
@@ -99,7 +100,7 @@ index 4d0deef..ea80724 100644
    static int narenas_limit;
    if (narenas_limit == 0)
      {
-@@ -1006,10 +1000,16 @@ reused_arena (void)
+@@ -1006,10 +1001,16 @@ reused_arena (void)
  	    narenas_limit = NARENAS_FROM_NCORES (2);
  	}
      }
@@ -118,7 +119,7 @@ index 4d0deef..ea80724 100644
    mstate result;
    static mstate next_to_use;
    if (next_to_use == NULL)
-@@ -1035,7 +1035,6 @@ reused_arena (void)
+@@ -1035,7 +1036,6 @@ reused_arena (void)
  
    return result;
  }
@@ -126,7 +127,7 @@ index 4d0deef..ea80724 100644
  
  static mstate
  internal_function
-@@ -1048,10 +1047,15 @@ arena_get2(a_tsd, size) mstate a_tsd; size_t size;
+@@ -1048,10 +1048,15 @@ arena_get2(a_tsd, size) mstate a_tsd; si
    mstate a;
  
  #ifdef PER_THREAD
@@ -146,7 +147,7 @@ index 4d0deef..ea80724 100644
  #else
    if(!a_tsd)
      a = a_tsd = &main_arena;
-@@ -1093,8 +1097,14 @@ arena_get2(a_tsd, size) mstate a_tsd; size_t size;
+@@ -1093,8 +1098,14 @@ arena_get2(a_tsd, size) mstate a_tsd; si
      goto repeat;
    }
  
@@ -163,10 +164,10 @@ index 4d0deef..ea80724 100644
    (void)mutex_unlock(&list_lock);
  #endif
  
-diff --git a/malloc/hooks.c b/malloc/hooks.c
-index 28845ee..e938492 100644
---- a/malloc/hooks.c
-+++ b/malloc/hooks.c
+Index: glibc-2.13/malloc/hooks.c
+===================================================================
+--- glibc-2.13.orig/malloc/hooks.c
++++ glibc-2.13/malloc/hooks.c
 @@ -579,9 +579,9 @@ public_gET_STATe(void)
    ms->max_fast = get_max_fast();
  #ifdef PER_THREAD
@@ -189,11 +190,11 @@ index 28845ee..e938492 100644
    }
    check_malloc_state(&main_arena);
  
-diff --git a/malloc/malloc.c b/malloc/malloc.c
-index b1d43c6..8dbadfa 100644
---- a/malloc/malloc.c
-+++ b/malloc/malloc.c
-@@ -2406,9 +2406,10 @@ struct malloc_par {
+Index: glibc-2.13/malloc/malloc.c
+===================================================================
+--- glibc-2.13.orig/malloc/malloc.c
++++ glibc-2.13/malloc/malloc.c
+@@ -2405,9 +2405,10 @@ struct malloc_par {
    INTERNAL_SIZE_T  top_pad;
    INTERNAL_SIZE_T  mmap_threshold;
  #ifdef PER_THREAD
@@ -205,7 +206,7 @@ index b1d43c6..8dbadfa 100644
  
    /* Memory map support */
    int              n_mmaps;
-@@ -2446,13 +2447,6 @@ static struct malloc_state main_arena;
+@@ -2445,13 +2446,6 @@ static struct malloc_state main_arena;
  static struct malloc_par mp_;
  
  
@@ -219,7 +220,7 @@ index b1d43c6..8dbadfa 100644
  /* Maximum size of memory handled in fastbins.  */
  static INTERNAL_SIZE_T global_max_fast;
  
-@@ -6095,12 +6089,12 @@ int mALLOPt(param_number, value) int param_number; int value;
+@@ -6111,12 +6105,12 @@ int mALLOPt(param_number, value) int par
      if (value > 0)
        mp_.arena_test = value;
      break;