[gcc] Enable atomic builtins for AVR

modm-io · Apr 20, 2024 · 78b2e26 · 78b2e26
1 parent 85d1324
commit 78b2e26
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/ext/gcc/atomics_c11_cortex.cpp.in → ext/gcc/atomics_c11.cpp.in b/ext/gcc/atomics_c11_cortex.cpp.in → ext/gcc/atomics_c11.cpp.in
@@ -24,7 +24,7 @@
 
 using _a8 = uint8_t;
 using _a16 = uint16_t;
-using _a32 = unsigned int;
+using _a32 = {{uint32_t}};
 using _a64 = uint64_t;
 
 // =========================== atomics for >64 bits ===========================

diff --git a/ext/gcc/libstdc++ b/ext/gcc/libstdc++
diff --git a/ext/gcc/module_c.lb b/ext/gcc/module_c.lb
@@ -20,9 +20,9 @@ def init(module):
 
 Refines the C language to make it easier to use on embedded targets.
 
-## ARM Cortex-M
+For AVR and ARMv6-M, C11 atomics are implemented via atomic lock.
 
-For ARMv6-M, C11 atomics are implemented via atomic lock.
+## ARM Cortex-M
 
 Additional compiler options:
 
@@ -32,10 +32,12 @@ Additional compiler options:
 
 def prepare(module, options):
     core = options[":target"].get_driver("core")["type"]
+
     if core.startswith("avr") or core.startswith("cortex-m"):
         module.depends(":architecture:assert")
-        if core.startswith("cortex-m0"):
-            module.depends(":architecture:atomic")
+
+    if core.startswith("avr") or core.startswith("cortex-m0"):
+        module.depends(":architecture:atomic")
 
     return True
 
@@ -46,10 +48,12 @@ def build(env):
 
     env.outbasepath = "modm/ext/gcc"
 
+    if core.startswith("avr") or core.startswith("cortex-m0"):
+        uint32_t = "uint32_t" if core.startswith("avr") else "unsigned int"
+        env.template("atomics_c11.cpp.in", substitutions={"uint32_t": uint32_t})
+
     if core.startswith("cortex-m"):
         env.copy("cabi_cortex.c", "cabi.c")
-        if core.startswith("cortex-m0"):
-            env.template("atomics_c11_cortex.cpp.in")
 
         # Compiler options for targets
         env.collect(":build:linkflags", "--specs=nosys.specs")
+9 −8		README.md
+1,552 −0		include/atomic
+1,703 −0		include/bits/atomic_base.h
+66 −0		include/bits/atomic_lockfree_defines.h
+116 −0		include/ext/atomicity.h
+1 −0		include/memory