Skip to content

Commit 21c0d78

Browse files
committed
Greenhills compiler: fix asm and volatile
Greenhills compiler doesn't accept volatile and __asm__ needs to be __asm.
1 parent ea677dd commit 21c0d78

8 files changed

Lines changed: 16 additions & 0 deletions

wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#define __volatile__ volatile
5252
#endif /* __KEIL__ */
5353
#ifdef __ghs__
54+
#define __asm__ __asm
55+
#define __volatile__
5456
#define WOLFSSL_NO_VAR_ASSIGN_REG
5557
#endif /* __ghs__ */
5658
#ifndef NO_AES

wolfcrypt/src/port/arm/armv8-32-chacha-asm_c.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#define __volatile__ volatile
5252
#endif /* __KEIL__ */
5353
#ifdef __ghs__
54+
#define __asm__ __asm
55+
#define __volatile__
5456
#define WOLFSSL_NO_VAR_ASSIGN_REG
5557
#endif /* __ghs__ */
5658
#ifdef HAVE_CHACHA

wolfcrypt/src/port/arm/armv8-32-curve25519_c.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#define __volatile__ volatile
5252
#endif /* __KEIL__ */
5353
#ifdef __ghs__
54+
#define __asm__ __asm
55+
#define __volatile__
5456
#define WOLFSSL_NO_VAR_ASSIGN_REG
5557
#endif /* __ghs__ */
5658
/* Based on work by: Emil Lenngren

wolfcrypt/src/port/arm/armv8-32-mlkem-asm_c.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#define __volatile__ volatile
5252
#endif /* __KEIL__ */
5353
#ifdef __ghs__
54+
#define __asm__ __asm
55+
#define __volatile__
5456
#define WOLFSSL_NO_VAR_ASSIGN_REG
5557
#endif /* __ghs__ */
5658
#include <wolfssl/wolfcrypt/wc_mlkem.h>

wolfcrypt/src/port/arm/armv8-32-poly1305-asm_c.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#define __volatile__ volatile
5252
#endif /* __KEIL__ */
5353
#ifdef __ghs__
54+
#define __asm__ __asm
55+
#define __volatile__
5456
#define WOLFSSL_NO_VAR_ASSIGN_REG
5557
#endif /* __ghs__ */
5658
#ifdef HAVE_POLY1305

wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#define __volatile__ volatile
5252
#endif /* __KEIL__ */
5353
#ifdef __ghs__
54+
#define __asm__ __asm
55+
#define __volatile__
5456
#define WOLFSSL_NO_VAR_ASSIGN_REG
5557
#endif /* __ghs__ */
5658
#ifndef NO_SHA256

wolfcrypt/src/port/arm/armv8-32-sha3-asm_c.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#define __volatile__ volatile
5252
#endif /* __KEIL__ */
5353
#ifdef __ghs__
54+
#define __asm__ __asm
55+
#define __volatile__
5456
#define WOLFSSL_NO_VAR_ASSIGN_REG
5557
#endif /* __ghs__ */
5658
#ifdef WOLFSSL_SHA3

wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#define __volatile__ volatile
5252
#endif /* __KEIL__ */
5353
#ifdef __ghs__
54+
#define __asm__ __asm
55+
#define __volatile__
5456
#define WOLFSSL_NO_VAR_ASSIGN_REG
5557
#endif /* __ghs__ */
5658
#if defined(WOLFSSL_SHA512) || defined(WOLFSSL_SHA384)

0 commit comments

Comments
 (0)