From 9c071083ee08c3675a4c909ff339f8e104aef2bf Mon Sep 17 00:00:00 2001
From: zgq-0218 <zhaoguoqiang8@huawei.com>
Date: Thu, 5 Jan 2023 20:37:20 +0800
Subject: [PATCH] disable musl test switch

Issue: #I692AU
Test: Build & Boot devices
Signed-off-by: zgq-0218 <zhaoguoqiang8@huawei.com>
---
 libc-test/src/functional/BUILD.gn             |  2 +-
 musl_config.gni                               |  2 +-
 porting/linux/user/src/internal/malloc_impl.h | 17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/libc-test/src/functional/BUILD.gn b/libc-test/src/functional/BUILD.gn
index 77bf4678..62f485d2 100644
--- a/libc-test/src/functional/BUILD.gn
+++ b/libc-test/src/functional/BUILD.gn
@@ -1,7 +1,7 @@
 import("../../test_template.gni")
 import("test_src_functional.gni")
 
-if (is_standard_system) {
+if (is_standard_system && musl_iterate_and_stats_api) {
   functional_list += malloc_stats_list
 }
 
diff --git a/musl_config.gni b/musl_config.gni
index 355a4d5a..87e27b17 100644
--- a/musl_config.gni
+++ b/musl_config.gni
@@ -60,7 +60,7 @@ declare_args() {
   if (!is_standard_system) {
     enable_musl_log = false
   }
-  musl_iterate_and_stats_api = true
+  musl_iterate_and_stats_api = false
   musl_secure_level = 1
 }
 
diff --git a/porting/linux/user/src/internal/malloc_impl.h b/porting/linux/user/src/internal/malloc_impl.h
index 0a9817a3..af97a813 100644
--- a/porting/linux/user/src/internal/malloc_impl.h
+++ b/porting/linux/user/src/internal/malloc_impl.h
@@ -10,10 +10,12 @@ hidden void __malloc_donate(char *, char *);
 
 hidden void *__memalign(size_t, size_t);
 
+#ifdef MUSL_ITERATE_AND_STATS_API 
 typedef struct occupied_bin_s {
 	struct chunk *head, *tail;
 	volatile int lock[2];
 } occupied_bin_t;
+#endif
 
 struct chunk {
 	size_t psize, csize;
@@ -60,6 +62,7 @@ hidden size_t __get_total_heap_space(void);
 #define ITERATE_AND_STATS_OVERHEAD (0)
 #endif
 
+#ifdef MUSL_ITERATE_AND_STATS_API
 #ifndef MALLOC_RED_ZONE
 #define SIZE_ALIGN (8*sizeof(size_t))
 #define OVERHEAD (2*sizeof(size_t) + ITERATE_AND_STATS_OVERHEAD)
@@ -67,12 +70,24 @@ hidden size_t __get_total_heap_space(void);
 #define SIZE_ALIGN (16*sizeof(size_t))
 #define OVERHEAD (4*sizeof(size_t) + ITERATE_AND_STATS_OVERHEAD)
 #endif
-
+#else
+#ifndef MALLOC_RED_ZONE
+#define SIZE_ALIGN (4*sizeof(size_t))
+#define OVERHEAD (2*sizeof(size_t))
+#else
+#define SIZE_ALIGN (8*sizeof(size_t))
+#define OVERHEAD (4*sizeof(size_t))
+#endif
+#endif
 
 #define MMAP_THRESHOLD (0x1c00*SIZE_ALIGN)
 #ifndef MALLOC_RED_ZONE
+#ifdef MUSL_ITERATE_AND_STATS_API
 #define DONTCARE OVERHEAD
 #else
+#define DONTCARE 16
+#endif
+#else
 #define DONTCARE OVERHEAD
 #define POINTER_USAGE (2*sizeof(void *))
 #endif
-- 
GitLab