The gcc in IDF 5.1 appears to have fixed the attribute bug affecting …

…IRAM_ATTR.
plerup · Jul 2, 2023 · f744768 · f744768
1 parent 7a14d3e
commit f744768
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/SoftwareSerial.cpp b/src/SoftwareSerial.cpp
@@ -606,6 +606,7 @@ void UARTBase::onReceive(Delegate<void(), void*>&& handler) {
     restoreInterrupts();
 }
 
+#if __GNUC__ < 12
 // The template member functions below must be in IRAM, but due to a bug GCC doesn't currently
 // honor the attribute. Instead, it is possible to do explicit specialization and adorn
 // these with the IRAM attribute:
@@ -616,4 +617,5 @@ template void IRAM_ATTR delegate::detail::DelegateImpl<void*, void>::operator()(
 template size_t IRAM_ATTR circular_queue<uint32_t, UARTBase*>::available() const;
 template bool IRAM_ATTR circular_queue<uint32_t, UARTBase*>::push(uint32_t&&);
 template bool IRAM_ATTR circular_queue<uint32_t, UARTBase*>::push(const uint32_t&);
+#endif // __GNUC__ < 12
 
diff --git a/src/SoftwareSerial.h b/src/SoftwareSerial.h
@@ -432,6 +432,7 @@ using UART = BasicUART< GpioCapabilities >;
 using SoftwareSerial = EspSoftwareSerial::UART;
 using namespace EspSoftwareSerial;
 
+#if __GNUC__ < 12
 // The template member functions below must be in IRAM, but due to a bug GCC doesn't currently
 // honor the attribute. Instead, it is possible to do explicit specialization and adorn
 // these with the IRAM attribute:
@@ -442,6 +443,7 @@ extern template void delegate::detail::DelegateImpl<void*, void>::operator()() c
 extern template size_t circular_queue<uint32_t, EspSoftwareSerial::UARTBase*>::available() const;
 extern template bool circular_queue<uint32_t, EspSoftwareSerial::UARTBase*>::push(uint32_t&&);
 extern template bool circular_queue<uint32_t, EspSoftwareSerial::UARTBase*>::push(const uint32_t&);
+#endif // __GNUC__ < 12
 
 #endif // __SoftwareSerial_h