From 8ff84f8975571ff65d7eae7601d68e7b7ca5861d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Leczkowski?= Date: Thu, 1 Aug 2024 15:44:43 +0200 Subject: [PATCH] arch: rename sparcv8leon3 to sparcv8leon JIRA: RTOS-883 --- arch/sparcv8leon/Makefile | 9 +++++++++ arch/{sparcv8leon3 => sparcv8leon}/crt0.S | 2 +- arch/{sparcv8leon3 => sparcv8leon}/jmp.S | 2 +- arch/{sparcv8leon3 => sparcv8leon}/reboot.c | 6 +++--- arch/{sparcv8leon3 => sparcv8leon}/signal.S | 2 +- arch/{sparcv8leon3 => sparcv8leon}/string.c | 2 +- arch/{sparcv8leon3 => sparcv8leon}/syscalls.S | 2 +- arch/sparcv8leon3/Makefile | 9 --------- include/arch.h | 2 +- include/arch/setjmp.h | 2 +- include/arch/{sparcv8leon3 => sparcv8leon}/arch.h | 12 ++++++------ include/arch/{sparcv8leon3 => sparcv8leon}/limits.h | 6 +++--- include/arch/{sparcv8leon3 => sparcv8leon}/setjmp.h | 6 +++--- include/arch/{sparcv8leon3 => sparcv8leon}/stdint.h | 8 ++++---- 14 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 arch/sparcv8leon/Makefile rename arch/{sparcv8leon3 => sparcv8leon}/crt0.S (93%) rename arch/{sparcv8leon3 => sparcv8leon}/jmp.S (98%) rename arch/{sparcv8leon3 => sparcv8leon}/reboot.c (79%) rename arch/{sparcv8leon3 => sparcv8leon}/signal.S (94%) rename arch/{sparcv8leon3 => sparcv8leon}/string.c (99%) rename arch/{sparcv8leon3 => sparcv8leon}/syscalls.S (95%) delete mode 100644 arch/sparcv8leon3/Makefile rename include/arch/{sparcv8leon3 => sparcv8leon}/arch.h (67%) rename include/arch/{sparcv8leon3 => sparcv8leon}/limits.h (91%) rename include/arch/{sparcv8leon3 => sparcv8leon}/setjmp.h (70%) rename include/arch/{sparcv8leon3 => sparcv8leon}/stdint.h (92%) diff --git a/arch/sparcv8leon/Makefile b/arch/sparcv8leon/Makefile new file mode 100644 index 00000000..478e7a96 --- /dev/null +++ b/arch/sparcv8leon/Makefile @@ -0,0 +1,9 @@ +# +# Makefile for libphoenix/arch/sparcv8leon +# +# Copyright 2022 Phoenix Systems +# Author: Lukasz Leczkowski +# + +OBJS += $(addprefix $(PREFIX_O)arch/sparcv8leon/, syscalls.o jmp.o signal.o string.o reboot.o) +CRT0_OBJS += $(addprefix $(PREFIX_O)arch/sparcv8leon/, crt0.o) diff --git a/arch/sparcv8leon3/crt0.S b/arch/sparcv8leon/crt0.S similarity index 93% rename from arch/sparcv8leon3/crt0.S rename to arch/sparcv8leon/crt0.S index 95ca69f5..636a0003 100644 --- a/arch/sparcv8leon3/crt0.S +++ b/arch/sparcv8leon/crt0.S @@ -3,7 +3,7 @@ * * libphoenix * - * Entrypoint (sparcv8leon3) + * Entrypoint (sparcv8leon) * * Copyright 2022, 2023 Phoenix Systems * Author: Lukasz Leczkowski, Hubert Badocha diff --git a/arch/sparcv8leon3/jmp.S b/arch/sparcv8leon/jmp.S similarity index 98% rename from arch/sparcv8leon3/jmp.S rename to arch/sparcv8leon/jmp.S index 3adc2d63..80d9481c 100644 --- a/arch/sparcv8leon3/jmp.S +++ b/arch/sparcv8leon/jmp.S @@ -3,7 +3,7 @@ * * libphoenix * - * setjmp, longjmp (sparcv8leon3) + * setjmp, longjmp (sparcv8leon) * * Copyright 2022 Phoenix Systems * Author: Lukasz Leczkowski diff --git a/arch/sparcv8leon3/reboot.c b/arch/sparcv8leon/reboot.c similarity index 79% rename from arch/sparcv8leon3/reboot.c rename to arch/sparcv8leon/reboot.c index 2a97ac7e..c404da28 100644 --- a/arch/sparcv8leon3/reboot.c +++ b/arch/sparcv8leon/reboot.c @@ -18,11 +18,11 @@ #include #if defined(__CPU_GR716) -#include +#include #elif defined(__CPU_GR712RC) -#include +#include #elif defined(__CPU_GENERIC) -#include +#include #else #error "Unsupported TARGET" #endif diff --git a/arch/sparcv8leon3/signal.S b/arch/sparcv8leon/signal.S similarity index 94% rename from arch/sparcv8leon3/signal.S rename to arch/sparcv8leon/signal.S index a3abd997..b525c36e 100644 --- a/arch/sparcv8leon3/signal.S +++ b/arch/sparcv8leon/signal.S @@ -3,7 +3,7 @@ * * libphoenix * - * Signal trampoline (sparcv8leon3) + * Signal trampoline (sparcv8leon) * * Copyright 2022 Phoenix Systems * Author: Lukasz Leczkowski diff --git a/arch/sparcv8leon3/string.c b/arch/sparcv8leon/string.c similarity index 99% rename from arch/sparcv8leon3/string.c rename to arch/sparcv8leon/string.c index c9edef57..fe86af47 100644 --- a/arch/sparcv8leon3/string.c +++ b/arch/sparcv8leon/string.c @@ -3,7 +3,7 @@ * * libphoenix * - * arch/sparcv8leon3 + * arch/sparcv8leon * * Copyright 2022 Phoenix Systems * Author: Lukasz Leczkowski diff --git a/arch/sparcv8leon3/syscalls.S b/arch/sparcv8leon/syscalls.S similarity index 95% rename from arch/sparcv8leon3/syscalls.S rename to arch/sparcv8leon/syscalls.S index 1a7517ba..136dff11 100644 --- a/arch/sparcv8leon3/syscalls.S +++ b/arch/sparcv8leon/syscalls.S @@ -3,7 +3,7 @@ * * libphoenix * - * syscalls (sparcv8leon3) + * syscalls (sparcv8leon) * * Copyright 2022 Phoenix Systems * Author: Lukasz Leczkowski diff --git a/arch/sparcv8leon3/Makefile b/arch/sparcv8leon3/Makefile deleted file mode 100644 index 48bb489e..00000000 --- a/arch/sparcv8leon3/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# Makefile for libphoenix/arch/sparcv8leon3 -# -# Copyright 2022 Phoenix Systems -# Author: Lukasz Leczkowski -# - -OBJS += $(addprefix $(PREFIX_O)arch/sparcv8leon3/, syscalls.o jmp.o signal.o string.o reboot.o) -CRT0_OBJS += $(addprefix $(PREFIX_O)arch/sparcv8leon3/, crt0.o) diff --git a/include/arch.h b/include/arch.h index d8cff06f..d352d2b5 100644 --- a/include/arch.h +++ b/include/arch.h @@ -13,7 +13,7 @@ #elif defined(__riscv) && (__riscv_xlen == 64) #include #elif defined(__sparc__) -#include +#include #else #error "unsupported architecture" #endif diff --git a/include/arch/setjmp.h b/include/arch/setjmp.h index 63171ffb..ec1b0d08 100644 --- a/include/arch/setjmp.h +++ b/include/arch/setjmp.h @@ -26,7 +26,7 @@ #elif defined(__riscv) && (__riscv_xlen == 64) #include #elif defined(__sparc__) -#include +#include #else #error "unsupported architecture" #endif diff --git a/include/arch/sparcv8leon3/arch.h b/include/arch/sparcv8leon/arch.h similarity index 67% rename from include/arch/sparcv8leon3/arch.h rename to include/arch/sparcv8leon/arch.h index c0992e26..a6fc2aeb 100644 --- a/include/arch/sparcv8leon3/arch.h +++ b/include/arch/sparcv8leon/arch.h @@ -3,7 +3,7 @@ * * libphoenix * - * Architecture dependent part (arch/sparcv8leon3) + * Architecture dependent part (arch/sparcv8leon) * * Copyright 2022 Phoenix Systems * Author: Lukasz Leczkowski @@ -13,11 +13,11 @@ * %LICENSE% */ -#ifndef _LIBPHOENIX_ARCH_SPARCV8LEON3_ARCH_H_ -#define _LIBPHOENIX_ARCH_SPARCV8LEON3_ARCH_H_ +#ifndef _LIBPHOENIX_ARCH_SPARCV8LEON_ARCH_H_ +#define _LIBPHOENIX_ARCH_SPARCV8LEON_ARCH_H_ -#define __ARCH_STDINT -#define __ARCH_LIMITS +#define __ARCH_STDINT +#define __ARCH_LIMITS #define __MEMCPY #define __MEMCMP @@ -58,7 +58,7 @@ static inline float __ieee754_sqrtf(float x) #else #define _PAGE_SIZE 0x1000 #endif -#define SIZE_PAGE _Pragma("GCC warning \"'SIZE_PAGE' is deprecated. Use _PAGE_SIZE from arch.h or PAGE_SIZE from limits.h (POSIX only)\"") _PAGE_SIZE +#define SIZE_PAGE _Pragma("GCC warning \"'SIZE_PAGE' is deprecated. Use _PAGE_SIZE from arch.h or PAGE_SIZE from limits.h (POSIX only)\"") _PAGE_SIZE #define __LIBPHOENIX_ARCH_TLS_SUPPORTED diff --git a/include/arch/sparcv8leon3/limits.h b/include/arch/sparcv8leon/limits.h similarity index 91% rename from include/arch/sparcv8leon3/limits.h rename to include/arch/sparcv8leon/limits.h index 913e77c4..091d84ba 100644 --- a/include/arch/sparcv8leon3/limits.h +++ b/include/arch/sparcv8leon/limits.h @@ -3,7 +3,7 @@ * * libphoenix * - * Architecture dependent part of limits (arch/sparcv8leon3) + * Architecture dependent part of limits (arch/sparcv8leon) * * Copyright 2022 Phoenix Systems * Author: Lukasz Leczkowski @@ -13,8 +13,8 @@ * %LICENSE% */ -#ifndef _LIBPHOENIX_ARCH_SPARCV8LEON3_LIMITS_H_ -#define _LIBPHOENIX_ARCH_SPARCV8LEON3_LIMITS_H_ +#ifndef _LIBPHOENIX_ARCH_SPARCV8LEON_LIMITS_H_ +#define _LIBPHOENIX_ARCH_SPARCV8LEON_LIMITS_H_ #include "arch.h" diff --git a/include/arch/sparcv8leon3/setjmp.h b/include/arch/sparcv8leon/setjmp.h similarity index 70% rename from include/arch/sparcv8leon3/setjmp.h rename to include/arch/sparcv8leon/setjmp.h index 7ef96221..e6e91e6f 100644 --- a/include/arch/sparcv8leon3/setjmp.h +++ b/include/arch/sparcv8leon/setjmp.h @@ -13,11 +13,11 @@ * %LICENSE% */ -#ifndef _LIBPHOENIX_ARCH_SPARCV8LEON3_SETJMP_H_ -#define _LIBPHOENIX_ARCH_SPARCV8LEON3_SETJMP_H_ +#ifndef _LIBPHOENIX_ARCH_SPARCV8LEON_SETJMP_H_ +#define _LIBPHOENIX_ARCH_SPARCV8LEON_SETJMP_H_ -#include +#include struct __jmp_buf { diff --git a/include/arch/sparcv8leon3/stdint.h b/include/arch/sparcv8leon/stdint.h similarity index 92% rename from include/arch/sparcv8leon3/stdint.h rename to include/arch/sparcv8leon/stdint.h index c5c5dcde..cc1b2666 100644 --- a/include/arch/sparcv8leon3/stdint.h +++ b/include/arch/sparcv8leon/stdint.h @@ -3,7 +3,7 @@ * * libphoenix * - * Architecture dependent part of stdint (arch/sparcv8leon3) + * Architecture dependent part of stdint (arch/sparcv8leon) * * Copyright 2022, 2024 Phoenix Systems * Author: Lukasz Leczkowski @@ -13,10 +13,10 @@ * %LICENSE% */ -#ifndef _LIBPHOENIX_ARCHSPARCV8LEON3_STDINT_H_ -#define _LIBPHOENIX_ARCHSPARCV8LEON3_STDINT_H_ +#ifndef _LIBPHOENIX_ARCH_SPARCV8LEON_STDINT_H_ +#define _LIBPHOENIX_ARCH_SPARCV8LEON_STDINT_H_ -#include +#include /* The following sections refer to ISO/IEC 9899:1999 */