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 d9dc8491c98539ef28c26bda5b1a1350b2446212..4db6d2c6778005066628a85a2e0e9865456acd61 100644 (file)
--- 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 a849901fabb0ad48e7b3979b4a20553fe4e47037..e336e38d66d4ac7e9137a1a4b040a0defebe05a6 100644 (file)
--- 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;