From: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date: Wed, 26 Oct 2016 09:37:33 +0000 (+0530)
Subject: Remove redundant definitions of M_ARENA_* macros
X-Git-Tag: glibc-2.25~381
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=68fc2ccc1aebc15b92e596b2bdc5605da1e25f3c;p=glibc.git

Remove redundant definitions of M_ARENA_* macros

The M_ARENA_MAX and M_ARENA_TEST macros are defined in malloc.c as
well as malloc.h, and the former is unnecessary.  This patch removes
the duplicate.  Tested on x86_64 to verify that the generated code
remains unchanged barring changed line numbers to __malloc_assert.

	* malloc/malloc.c (M_ARENA_TEST, M_ARENA_MAX): Remove.
---

diff --git a/ChangeLog b/ChangeLog
index d9dc8491c9..4db6d2c677 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-10-26  Siddhesh Poyarekar  <siddhesh@sourceware.org>
 
+	* malloc/malloc.c (M_ARENA_TEST, M_ARENA_MAX): Remove.
+
 	* manual/memory.texi (M_TOP_PAD): Remove reference to sbrk.
 	(M_TRIM_THRESHOLD): Likewise.
 
diff --git a/malloc/malloc.c b/malloc/malloc.c
index a849901fab..e336e38d66 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1717,11 +1717,6 @@ static struct malloc_par mp_ =
   .arena_test = NARENAS_FROM_NCORES (1)
 };
 
-
-#define M_ARENA_TEST -7
-#define M_ARENA_MAX  -8
-
-
 /* Maximum size of memory handled in fastbins.  */
 static INTERNAL_SIZE_T global_max_fast;