Added proposed fixes
Signed-off-by: Matthias Schulz <mschulz@hilscher.com>
diff --git a/library/constant_time_impl.h b/library/constant_time_impl.h
index aff48cf..57bb52e 100644
--- a/library/constant_time_impl.h
+++ b/library/constant_time_impl.h
@@ -120,10 +120,12 @@
* On Thumb 2 and Arm, both compilers are happy with the "s" suffix,
* although we don't actually care about setting the flags.
*
- * For gcc, restore divided syntax afterwards - otherwise old versions of gcc
+ * For old versions of gcc excluding 4.8 and 4.9 (see #8516 for details),
+ * restore divided syntax afterwards - otherwise old versions of gcc
* seem to apply unified syntax globally, which breaks other asm code.
*/
-#if !defined(__clang__) && !(__GNUC__ == 4 && __GNUC_MINOR__ == 9)
+#if defined(MBEDTLS_COMPILER_IS_GCC) && defined(__thumb__) && !defined(__thumb2__) && \
+ (__GNUC__ < 11) && !((__GNUC__ == 4) && ((__GNUC_MINOR__ == 8) || (__GNUC_MINOR__ == 9)))
#define RESTORE_ASM_SYNTAX ".syntax divided \n\t"
#else
#define RESTORE_ASM_SYNTAX