Skip to content

Commit

Permalink
Merge pull request #6869 from davidhorstmann-arm/2.28-workaround-uncr…
Browse files Browse the repository at this point in the history 
…ustify-asm-defines

[Backport 2.28] Workaround Uncrustify parsing of "asm"
  • Loading branch information
@gilles-peskine-arm
gilles-peskine-arm authored Jan 4, 2023
2 parents a6ad7f4 + b6bf5f5 commit d1a96b6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions include/mbedtls/bn_mul.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,11 @@

#if defined(MBEDTLS_HAVE_ASM)

/* *INDENT-OFF* */
#ifndef asm
#define asm __asm
#endif
/* *INDENT-ON* */

/* armcc5 --gnu defines __GNUC__ but doesn't support GNU's extended asm */
#if defined(__GNUC__) && \
Expand Down
2 changes: 2 additions & 0 deletions library/aesni.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@

#include <string.h>

/* *INDENT-OFF* */
#ifndef asm
#define asm __asm
#endif
/* *INDENT-ON* */

#if defined(MBEDTLS_HAVE_X86_64)

Expand Down
2 changes: 2 additions & 0 deletions library/padlock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@

#include <string.h>

/* *INDENT-OFF* */
#ifndef asm
#define asm __asm
#endif
/* *INDENT-ON* */

#if defined(MBEDTLS_HAVE_X86)

Expand Down
2 changes: 2 additions & 0 deletions library/timing.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@
#error "This module only works on Unix and Windows, see MBEDTLS_TIMING_C in config.h"
#endif

/* *INDENT-OFF* */
#ifndef asm
#define asm __asm
#endif
/* *INDENT-ON* */

#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)

Expand Down

0 comments on commit d1a96b6

Please sign in to comment.