lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-05 19:35:48 +03:00
Code Activity

Merge pull request #8516 from mschulz-at-hilscher/fixes/divided-assembler-syntax-error-gcc493

Browse Source 
Fixes invalid default choice of thumb assembler syntax.
This commit is contained in:
Dave Rodgman
2023-11-14 17:57:37 +00:00
committed by GitHub
parent 752dd39a69 e94525bd17
commit cba4091581
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/constant_time_impl.h
View File

@@ -120,10 +120,12 @@ static inline mbedtls_ct_uint_t mbedtls_ct_compiler_opaque(mbedtls_ct_uint_t x)
* On Thumb 2 and Arm, both compilers are happy with the "s" suffix, * On Thumb 2 and Arm, both compilers are happy with the "s" suffix,
* although we don't actually care about setting the flags. * 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 (see #8516 for details), restore divided
* seem to apply unified syntax globally, which breaks other asm code. * syntax afterwards - otherwise old versions of gcc seem to apply
* unified syntax globally, which breaks other asm code.
*/ */
#if !defined(__clang__) #if defined(MBEDTLS_COMPILER_IS_GCC) && defined(__thumb__) && !defined(__thumb2__) && \
(__GNUC__ < 11) && !defined(__ARM_ARCH_2__)
#define RESTORE_ASM_SYNTAX ".syntax divided \n\t" #define RESTORE_ASM_SYNTAX ".syntax divided \n\t"
#else #else
#define RESTORE_ASM_SYNTAX #define RESTORE_ASM_SYNTAX