samples: Switch from NEWLIB_LIBC to REQUIRES_FULL_LIBC

Instead of forcing use of NEWLIB_LIBC, select any available complete C library implementation. Add CONFIG_REQUIRES_FLOAT_PRINTF and adjust CONFIG_LIBC_MALLOC_ARENA_SIZE as needed. Signed-off-by: Keith Packard <keithp@keithp.com>
zephyrproject-rtos · Oct 23, 2023 · 70faf04 · 70faf04
1 parent dfd65bd
commit 70faf04
Show file tree

Hide file tree

Showing 74 changed files with 107 additions and 105 deletions.
diff --git a/samples/basic/hash_map/sample.yaml b/samples/basic/hash_map/sample.yaml
@@ -36,21 +36,21 @@ tests:
       - CONFIG_SYS_HASH_FUNC32_CHOICE_DJB2=y
   # Newlib
   libraries.hash_map.newlib.separate_chaining.djb2:
-    filter: TOOLCHAIN_HAS_NEWLIB == 1
+    filter: CONFIG_FULL_LIBC_SUPPORTED
     extra_configs:
       - CONFIG_NEWLIB_LIBC=y
       - CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192
       - CONFIG_SYS_HASH_MAP_CHOICE_SC=y
       - CONFIG_SYS_HASH_FUNC32_CHOICE_DJB2=y
   libraries.hash_map.newlib.open_addressing.djb2:
-    filter: TOOLCHAIN_HAS_NEWLIB == 1
+    filter: CONFIG_FULL_LIBC_SUPPORTED
     extra_configs:
       - CONFIG_NEWLIB_LIBC=y
       - CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192
       - CONFIG_SYS_HASH_MAP_CHOICE_OA_LP=y
       - CONFIG_SYS_HASH_FUNC32_CHOICE_DJB2=y
   libraries.hash_map.newlib.cxx_unordered_map.djb2:
-    filter: TOOLCHAIN_HAS_NEWLIB == 1
+    filter: CONFIG_FULL_LIBC_SUPPORTED
     extra_configs:
       - CONFIG_NEWLIB_LIBC=y
       - CONFIG_NEWLIB_LIBC_MIN_REQUIRED_HEAP_SIZE=8192

diff --git a/samples/bluetooth/tmap_bmr/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/tmap_bmr/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/tmap_bmr/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/tmap_bmr/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/tmap_bms/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/tmap_bms/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/tmap_bms/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/tmap_bms/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/tmap_central/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/tmap_central/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/tmap_central/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/tmap_central/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/tmap_peripheral/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/tmap_peripheral/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/tmap_peripheral/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/tmap_peripheral/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/unicast_audio_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/unicast_audio_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/unicast_audio_client/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/unicast_audio_client/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/unicast_audio_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/unicast_audio_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/bluetooth/unicast_audio_server/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/unicast_audio_server/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -4,5 +4,5 @@ CONFIG_LIBLC3=y
 # The LC3 codec uses a large amount of stack. This app runs the codec in the work-queue, hence
 # inctease stack size for that thread.
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-# LC3 lib requires floating point support in the c-lib NEWLIB is one way of getting that.
-CONFIG_NEWLIB_LIBC=y
+# LC3 lib requires floating point support in the c-lib.
+CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/boards/nrf/clock_skew/prj.conf b/samples/boards/nrf/clock_skew/prj.conf
@@ -1,3 +1,3 @@
 CONFIG_COUNTER=y
-CONFIG_NEWLIB_LIBC=y
-CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
+CONFIG_REQUIRES_FULL_LIBC=y
+CONFIG_REQUIRES_FLOAT_PRINTF=y
diff --git a/samples/compression/lz4/prj.conf b/samples/compression/lz4/prj.conf
@@ -1,3 +1,4 @@
 CONFIG_LZ4=y
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_HEAP_MEM_POOL_SIZE=16384
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=65536
diff --git a/samples/compression/lz4/sample.yaml b/samples/compression/lz4/sample.yaml
@@ -6,7 +6,7 @@ common:
     - compression
     - lz4
   min_ram: 64
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED
   harness: console
   harness_config:
     type: one_line

diff --git a/samples/drivers/counter/maxim_ds3231/prj.conf b/samples/drivers/counter/maxim_ds3231/prj.conf
@@ -6,7 +6,7 @@ CONFIG_COUNTER_MAXIM_DS3231=y
 CONFIG_COUNTER_INIT_PRIORITY=65
 
 # Minimal libc doesn't have strftime()
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 
 # Optional step that syncs RTC and local clock.  Don't enable this if
 # your RTC has already been synchronized and you want to keep its

diff --git a/samples/drivers/counter/maxim_ds3231/sample.yaml b/samples/drivers/counter/maxim_ds3231/sample.yaml
@@ -1,5 +1,5 @@
 common:
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED
 sample:
   name: Maxim DS3231 RTC
 tests:

diff --git a/samples/modules/tflite-micro/hello_world/README.rst b/samples/modules/tflite-micro/hello_world/README.rst
@@ -94,7 +94,7 @@ TensorFlow, you must enable the below Kconfig options in your :file:`prj.conf`:
 .. code-block:: kconfig
 
     CONFIG_CPP=y
-    CONFIG_NEWLIB_LIBC=y
+    CONFIG_REQUIRES_FULL_LIBC=y
     CONFIG_TENSORFLOW_LITE_MICRO=y
 
 Note that the CMSIS-NN kernel sample demonstrates how to use CMSIS-NN optimized kernels with

diff --git a/samples/modules/tflite-micro/hello_world/sample.yaml b/samples/modules/tflite-micro/hello_world/sample.yaml
@@ -20,7 +20,7 @@ tests:
     integration_platforms:
       - qemu_x86
     tags: tensorflow
-    filter: TOOLCHAIN_HAS_NEWLIB == 1
+    filter: CONFIG_FULL_LIBC_SUPPORTED
   sample.tensorflow.helloworld.cmsis_nn:
     tags: tensorflow
     platform_allow: mps3_an547

diff --git a/samples/modules/tflite-micro/magic_wand/README.rst b/samples/modules/tflite-micro/magic_wand/README.rst
@@ -107,7 +107,7 @@ TensorFlow, you must enable the below Kconfig options in your :file:`prj.conf`:
 .. code-block:: kconfig
 
     CONFIG_CPP=y
-    CONFIG_NEWLIB_LIBC=y
+    CONFIG_REQUIRES_FULL_LIBC=y
     CONFIG_TENSORFLOW_LITE_MICRO=y
 
 Training

diff --git a/samples/modules/tflite-micro/magic_wand/prj.conf b/samples/modules/tflite-micro/magic_wand/prj.conf
@@ -14,7 +14,7 @@
 # ==============================================================================
 CONFIG_CPP=y
 CONFIG_STD_CPP17=y
-CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
+CONFIG_REQUIRES_FLOAT_PRINTF=y
 CONFIG_SENSOR=y
 CONFIG_NETWORKING=n
 CONFIG_MAIN_STACK_SIZE=4096

diff --git a/samples/net/cloud/aws_iot_mqtt/prj.conf b/samples/net/cloud/aws_iot_mqtt/prj.conf
@@ -9,7 +9,7 @@ CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_INIT_STACKS=y
 CONFIG_HW_STACK_PROTECTION=y
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_SNTP=y
 CONFIG_JSON_LIBRARY=y
 CONFIG_POSIX_CLOCK=y

diff --git a/samples/net/cloud/aws_iot_mqtt/sample.yaml b/samples/net/cloud/aws_iot_mqtt/sample.yaml
@@ -4,7 +4,7 @@ sample:
 common:
   tags: net mqtt cloud
   harness: net
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED
   extra_args: USE_DUMMY_CREDS=1
 tests:
   sample.net.cloud.aws_iot_mqtt:

diff --git a/samples/net/cloud/mqtt_azure/prj.conf b/samples/net/cloud/mqtt_azure/prj.conf
@@ -47,7 +47,7 @@ CONFIG_DNS_RESOLVER=y
 CONFIG_DNS_SERVER_IP_ADDRESSES=y
 CONFIG_DNS_SERVER1="8.8.8.8"
 CONFIG_DNS_RESOLVER_ADDITIONAL_BUF_CTR=2
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 
 CONFIG_INIT_STACKS=y
 CONFIG_NET_SHELL=y

diff --git a/samples/net/cloud/mqtt_azure/sample.yaml b/samples/net/cloud/mqtt_azure/sample.yaml
@@ -1,5 +1,5 @@
 common:
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED
 sample:
   description: MQTT sample app to Azure cloud
   name: mqtt-azure

diff --git a/samples/net/dsa/prj.conf b/samples/net/dsa/prj.conf
@@ -49,7 +49,7 @@ CONFIG_NET_TC_TX_COUNT=6
 CONFIG_NET_TC_RX_COUNT=4
 CONFIG_NET_CONFIG_INIT_TIMEOUT=10
 
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 
 CONFIG_NET_IF_MAX_IPV4_COUNT=4
 CONFIG_NET_IF_MAX_IPV6_COUNT=4

diff --git a/samples/net/gptp/boards/mimxrt1050_evk.conf b/samples/net/gptp/boards/mimxrt1050_evk.conf
@@ -7,5 +7,5 @@ CONFIG_ETH_MCUX_PTP_CLOCK_SRC_HZ=25000000
 CONFIG_ETH_MCUX_RX_BUFFERS=6
 CONFIG_ETH_MCUX_TX_BUFFERS=4
 CONFIG_NET_GPTP_STATISTICS=y
-CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
+CONFIG_REQUIRES_FLOAT_PRINTF=y
diff --git a/samples/net/gptp/boards/mimxrt1060_evk.conf b/samples/net/gptp/boards/mimxrt1060_evk.conf
@@ -6,6 +6,6 @@ CONFIG_NET_GPTP_CLOCK_ACCURACY_25MS=y
 #CONFIG_ETH_MCUX_RX_BUFFERS=6
 #CONFIG_ETH_MCUX_TX_BUFFERS=8
 CONFIG_NET_GPTP_STATISTICS=y
-CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FLOAT_PRINTF=y
+CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_NET_GPTP_INIT_LOG_PDELAY_REQ_ITV=-3
diff --git a/samples/net/lwm2m_client/overlay-ot.conf b/samples/net/lwm2m_client/overlay-ot.conf
@@ -1,7 +1,7 @@
 # Main
 CONFIG_MAIN_STACK_SIZE=2048
 
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 
 # Disable TCP and IPv4 (TCP disabled to avoid heavy traffic)
 CONFIG_NET_TCP=n

diff --git a/samples/net/sockets/big_http_download/prj.conf b/samples/net/sockets/big_http_download/prj.conf
@@ -1,5 +1,5 @@
 # General config
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MAIN_STACK_SIZE=2536

diff --git a/samples/net/sockets/big_http_download/sample.yaml b/samples/net/sockets/big_http_download/sample.yaml
@@ -2,7 +2,7 @@ sample:
   description: BSD Sockets big HTTP download example
   name: big_http_download
 common:
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   harness: net
   min_ram: 32
   min_flash: 128

diff --git a/samples/net/sockets/coap_client/prj.conf b/samples/net/sockets/coap_client/prj.conf
@@ -1,6 +1,6 @@
 # Generic networking options
 CONFIG_NETWORKING=y
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 

diff --git a/samples/net/sockets/coap_client/sample.yaml b/samples/net/sockets/coap_client/sample.yaml
@@ -1,5 +1,5 @@
 common:
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
 sample:
   description: TBD
   name: TBD

diff --git a/samples/net/sockets/coap_server/prj.conf b/samples/net/sockets/coap_server/prj.conf
@@ -1,6 +1,6 @@
 # Generic networking options
 CONFIG_NETWORKING=y
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_NET_UDP=y
 
 # Socket

diff --git a/samples/net/sockets/coap_server/sample.yaml b/samples/net/sockets/coap_server/sample.yaml
@@ -1,5 +1,5 @@
 common:
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
 sample:
   description: TBD
   name: TBD

diff --git a/samples/net/sockets/dumb_http_server/prj.conf b/samples/net/sockets/dumb_http_server/prj.conf
@@ -1,5 +1,5 @@
 # General config
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 
 # Networking config
 CONFIG_NETWORKING=y

diff --git a/samples/net/sockets/dumb_http_server/sample.yaml b/samples/net/sockets/dumb_http_server/sample.yaml
@@ -2,7 +2,7 @@ sample:
   description: BSD Sockets API dumb HTTP server example
   name: socket_dumb_http_server
 common:
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   harness: net
   min_ram: 32
   min_flash: 96

diff --git a/samples/net/sockets/echo/sample.yaml b/samples/net/sockets/echo/sample.yaml
@@ -4,7 +4,7 @@ sample:
 common:
   harness: net
   depends_on: netif
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
 tests:
   sample.net.sockets.echo:
     tags:

diff --git a/samples/net/sockets/echo_async/prj.conf b/samples/net/sockets/echo_async/prj.conf
@@ -1,5 +1,5 @@
 # General config
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_MAIN_STACK_SIZE=1200
 
 # Networking config

diff --git a/samples/net/sockets/echo_async/sample.yaml b/samples/net/sockets/echo_async/sample.yaml
@@ -2,7 +2,7 @@ sample:
   description: BSD Sockets API TCP echo server sample using non-blocking sockets
   name: socket_echo_async
 common:
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   harness: net
   platform_allow: qemu_x86
   tags:

diff --git a/samples/net/sockets/echo_async_select/prj.conf b/samples/net/sockets/echo_async_select/prj.conf
@@ -1,5 +1,5 @@
 # General config
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 CONFIG_MAIN_STACK_SIZE=1200
 CONFIG_POSIX_API=y
 

diff --git a/samples/net/sockets/echo_async_select/sample.yaml b/samples/net/sockets/echo_async_select/sample.yaml
@@ -7,7 +7,7 @@ common:
   tags:
     - net
     - socket
-  filter: TOOLCHAIN_HAS_NEWLIB == 1
+  filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
 tests:
   sample.net.sockets.echo_async_select:
     extra_configs:

diff --git a/samples/net/sockets/echo_client/overlay-ot.conf b/samples/net/sockets/echo_client/overlay-ot.conf
@@ -1,4 +1,4 @@
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBC=y
 
 # Disable TCP and IPv4 (TCP disabled to avoid heavy traffic)
 CONFIG_NET_TCP=n

diff --git a/samples/net/sockets/echo_client/sample.yaml b/samples/net/sockets/echo_client/sample.yaml
@@ -81,7 +81,7 @@ tests:
       - net
       - openthread
     platform_allow: nrf52840dk_nrf52840
-    filter: TOOLCHAIN_HAS_NEWLIB == 1
+    filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_client.b91_802154:
     extra_args: OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: tlsr9518adk80d
@@ -92,15 +92,15 @@ tests:
       - net
       - openthread
     platform_allow: tlsr9518adk80d
-    filter: TOOLCHAIN_HAS_NEWLIB == 1
+    filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_client.kw41z_openthread:
     extra_args: OVERLAY_CONFIG="overlay-ot.conf"
     slow: true
     tags:
       - net
       - openthread
     platform_allow: frdm_kw41z
-    filter: TOOLCHAIN_HAS_NEWLIB == 1
+    filter: CONFIG_FULL_LIBC_SUPPORTED and not CONFIG_NATIVE_LIBC
   sample.net.sockets.echo_client.userspace:
     extra_args:
       - CONFIG_USERSPACE=y