From cf037b2e2895be335d41e12f64cd7d3704983585 Mon Sep 17 00:00:00 2001
From: Aarav Gupta <aarav@spikonado.com>
Date: Wed, 15 Apr 2026 17:07:49 +0530
Subject: [PATCH] Remove atomic patch

Co-authored-by: Narukara <narukara17@gmail.com>
---
 colcon.meta    |  2 +-
 libmicroros.mk | 44 +-------------------------------------------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/colcon.meta b/colcon.meta
index ce2992a2..10c22199 100644
--- a/colcon.meta
+++ b/colcon.meta
@@ -17,7 +17,7 @@
                 "-DENABLE_TESTING=OFF",
                 "-DRCUTILS_NO_FILESYSTEM=ON",
                 "-DRCUTILS_NO_THREAD_SUPPORT=ON",
-                "-DRCUTILS_NO_64_ATOMIC=ON",
+                "-DRCUTILS_NO_64_ATOMIC=OFF",
                 "-DRCUTILS_AVOID_DYNAMIC_ALLOCATION=ON"
             ]
         },
diff --git a/libmicroros.mk b/libmicroros.mk
index 47f94faf..651e49f2 100644
--- a/libmicroros.mk
+++ b/libmicroros.mk
@@ -111,49 +111,7 @@ $(EXTENSIONS_DIR)/micro_ros_src/install: $(EXTENSIONS_DIR)/esp32_toolchain.cmake
 		-DCMAKE_C_STANDARD=$(C_STANDARD) \
 		-DUCLIENT_C_STANDARD=$(C_STANDARD);
 
-patch_atomic:$(EXTENSIONS_DIR)/micro_ros_src/install
-# Workaround https://github.com/micro-ROS/micro_ros_espidf_component/issues/18
-ifeq ($(IDF_TARGET),$(filter $(IDF_TARGET),esp32s2 esp32c3 esp32c6))
-		echo $(UROS_DIR)/atomic_workaround; \
-		mkdir $(UROS_DIR)/atomic_workaround; cd $(UROS_DIR)/atomic_workaround; \
-		$(X_AR) x $(UROS_DIR)/install/lib/librcutils.a; \
-		$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_fetch_add_8; \
-		if [ $(IDF_VERSION_MAJOR) -ge 4 ] && [ $(IDF_VERSION_MINOR) -ge 3 ]; then \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_load_8; \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_store_8; \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_exchange_8; \
-		fi; \
-		if [ $(IDF_VERSION_MAJOR) -ge 4 ] && [ $(IDF_VERSION_MINOR) -ge 4 ]; then \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_load_8; \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_store_8; \
-		fi; \
-		if [ $(IDF_VERSION_MAJOR) -ge 5 ] && [ $(IDF_VERSION_MINOR) -ge 0 ]; then \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_load_8; \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_store_8; \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_exchange_8; \
-		fi; \
-		$(X_AR) rc -s librcutils.a *.obj; \
-		cp -rf librcutils.a  $(UROS_DIR)/install/lib/librcutils.a; \
-		cd ..; \
-		rm -rf $(UROS_DIR)/atomic_workaround;
-endif
-ifeq ($(IDF_TARGET),$(filter $(IDF_TARGET),esp32))
-		echo $(UROS_DIR)/atomic_workaround; \
-		mkdir $(UROS_DIR)/atomic_workaround; cd $(UROS_DIR)/atomic_workaround; \
-		$(X_AR) x $(UROS_DIR)/install/lib/librcutils.a; \
-		$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_fetch_add_8; \
-		if [ $(IDF_VERSION_MAJOR) -ge 5 ] && [ $(IDF_VERSION_MINOR) -ge 3 ]; then \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_load_8; \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_store_8; \
-			$(X_STRIP) atomic_64bits.c.obj --strip-symbol=__atomic_exchange_8; \
-		fi; \
-		$(X_AR) rc -s librcutils.a *.obj; \
-		cp -rf librcutils.a  $(UROS_DIR)/install/lib/librcutils.a; \
-		cd ..; \
-		rm -rf $(UROS_DIR)/atomic_workaround;
-endif
-
-$(EXTENSIONS_DIR)/libmicroros.a: $(EXTENSIONS_DIR)/micro_ros_src/install patch_atomic
+$(EXTENSIONS_DIR)/libmicroros.a: $(EXTENSIONS_DIR)/micro_ros_src/install
 	mkdir -p $(UROS_DIR)/libmicroros; cd $(UROS_DIR)/libmicroros; \
 	for file in $$(find $(UROS_DIR)/install/lib/ -name '*.a'); do \
 		folder=$$(echo $$file | sed -E "s/(.+)\/(.+).a/\2/"); \