GitHub-Mirror/opensbi
2
0
Fork 0
mirror of https://github.com/Fishwaldo/opensbi.git synced 2025-06-23 22:58:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

include: headers: Replace __ASSEMBLY__ with __ASSEMBLER__

Browse source 
GCC has already a predefined macro __ASSEMBLER__ therefore, it can be
used without the need to define a new flag with -D__ASSEMBLY__.
This is useful when adding the library to projects having a build
system such one can build without the need to make changes.
THe build system does not use the Makefile in the sources tree.

Signed-off-by: Marouene Boubakri <marouene.boubakri@nxp.com>
Signed-off-by: Anup Patel <anup.patel@wdc.com>
This commit is contained in:
Marouene Boubakri 2021-03-12 12:00:01 +01:00 • committed by Anup Patel
parent ddad02d625
commit bfc85c70e7
8 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -217,7 +217,7 @@ CPPFLAGS += $(GENFLAGS)
CPPFLAGS += $(platform-cppflags-y) CPPFLAGS += $(platform-cppflags-y)
CPPFLAGS += $(firmware-cppflags-y) CPPFLAGS += $(firmware-cppflags-y)
ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ ASFLAGS = -g -Wall -nostdlib
ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
ASFLAGS += -mno-save-restore -mstrict-align ASFLAGS += -mno-save-restore -mstrict-align
ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA)

2
include/sbi/fw_dynamic.h
View file

@ -40,7 +40,7 @@
/* clang-format on */ /* clang-format on */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <sbi/sbi_types.h> #include <sbi/sbi_types.h>

10
include/sbi/riscv_asm.h
View file

@ -14,7 +14,7 @@
/* clang-format off */ /* clang-format off */
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
#define __ASM_STR(x) x #define __ASM_STR(x) x
#else #else
#define __ASM_STR(x) #x #define __ASM_STR(x) #x
@ -38,7 +38,7 @@
#define LGREG __REG_SEL(3, 2) #define LGREG __REG_SEL(3, 2)
#if __SIZEOF_POINTER__ == 8 #if __SIZEOF_POINTER__ == 8
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
#define RISCV_PTR .dword #define RISCV_PTR .dword
#define RISCV_SZPTR 8 #define RISCV_SZPTR 8
#define RISCV_LGPTR 3 #define RISCV_LGPTR 3
@ -48,7 +48,7 @@
#define RISCV_LGPTR "3" #define RISCV_LGPTR "3"
#endif #endif
#elif __SIZEOF_POINTER__ == 4 #elif __SIZEOF_POINTER__ == 4
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
#define RISCV_PTR .word #define RISCV_PTR .word
#define RISCV_SZPTR 4 #define RISCV_SZPTR 4
#define RISCV_LGPTR 2 #define RISCV_LGPTR 2
@ -79,7 +79,7 @@
/* clang-format on */ /* clang-format on */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#define csr_swap(csr, val) \ #define csr_swap(csr, val) \
({ \ ({ \
@ -182,6 +182,6 @@ int pmp_set(unsigned int n, unsigned long prot, unsigned long addr,
int pmp_get(unsigned int n, unsigned long *prot_out, unsigned long *addr_out, int pmp_get(unsigned int n, unsigned long *prot_out, unsigned long *addr_out,
unsigned long *log2len); unsigned long *log2len);
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLER__ */
#endif #endif

2
include/sbi/sbi_const.h
View file

@ -22,7 +22,7 @@
/* clang-format off */ /* clang-format off */
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLER__
#define _AC(X,Y) X #define _AC(X,Y) X
#define _AT(T,X) X #define _AT(T,X) X
#else #else

2
include/sbi/sbi_platform.h
View file

@ -38,7 +38,7 @@
#define SBI_PLATFORM_TLB_RANGE_FLUSH_LIMIT_DEFAULT (1UL << 12) #define SBI_PLATFORM_TLB_RANGE_FLUSH_LIMIT_DEFAULT (1UL << 12)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <sbi/sbi_ecall_interface.h> #include <sbi/sbi_ecall_interface.h>
#include <sbi/sbi_error.h> #include <sbi/sbi_error.h>

2
include/sbi/sbi_scratch.h
View file

@ -43,7 +43,7 @@
/* clang-format on */ /* clang-format on */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <sbi/sbi_types.h> #include <sbi/sbi_types.h>

2
include/sbi/sbi_trap.h
View file

@ -110,7 +110,7 @@
/** Size (in bytes) of sbi_trap_info */ /** Size (in bytes) of sbi_trap_info */
#define SBI_TRAP_INFO_SIZE SBI_TRAP_INFO_OFFSET(last) #define SBI_TRAP_INFO_SIZE SBI_TRAP_INFO_OFFSET(last)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <sbi/sbi_types.h> #include <sbi/sbi_types.h>

2
lib/utils/libfdt/fdt.h
View file

@ -7,7 +7,7 @@
* Copyright 2012 Kim Phillips, Freescale Semiconductor. * Copyright 2012 Kim Phillips, Freescale Semiconductor.
*/ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
struct fdt_header { struct fdt_header {
fdt32_t magic; /* magic word FDT_MAGIC */ fdt32_t magic; /* magic word FDT_MAGIC */