Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

arch: rename sparcv8leon3 to sparcv8leon #390

Merged
merged 1 commit into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions arch/sparcv8leon/Makefile
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion arch/sparcv8leon3/crt0.S → arch/sparcv8leon/crt0.S
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* libphoenix
*
* Entrypoint (sparcv8leon3)
* Entrypoint (sparcv8leon)
*
* Copyright 2022, 2023 Phoenix Systems
* Author: Lukasz Leczkowski, Hubert Badocha
Expand Down
2 changes: 1 addition & 1 deletion arch/sparcv8leon3/jmp.S → arch/sparcv8leon/jmp.S
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* libphoenix
*
* setjmp, longjmp (sparcv8leon3)
* setjmp, longjmp (sparcv8leon)
*
* Copyright 2022 Phoenix Systems
* Author: Lukasz Leczkowski
Expand Down
6 changes: 3 additions & 3 deletions arch/sparcv8leon3/reboot.c → arch/sparcv8leon/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
#include <sys/platform.h>

#if defined(__CPU_GR716)
#include <phoenix/arch/sparcv8leon3/gr716/gr716.h>
#include <phoenix/arch/sparcv8leon/gr716/gr716.h>
#elif defined(__CPU_GR712RC)
#include <phoenix/arch/sparcv8leon3/gr712rc/gr712rc.h>
#include <phoenix/arch/sparcv8leon/gr712rc/gr712rc.h>
#elif defined(__CPU_GENERIC)
#include <phoenix/arch/sparcv8leon3/generic/generic.h>
#include <phoenix/arch/sparcv8leon/generic/generic.h>
#else
#error "Unsupported TARGET"
#endif
Expand Down
2 changes: 1 addition & 1 deletion arch/sparcv8leon3/signal.S → arch/sparcv8leon/signal.S
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* libphoenix
*
* Signal trampoline (sparcv8leon3)
* Signal trampoline (sparcv8leon)
*
* Copyright 2022 Phoenix Systems
* Author: Lukasz Leczkowski
Expand Down
2 changes: 1 addition & 1 deletion arch/sparcv8leon3/string.c → arch/sparcv8leon/string.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* libphoenix
*
* arch/sparcv8leon3
* arch/sparcv8leon
*
* Copyright 2022 Phoenix Systems
* Author: Lukasz Leczkowski
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* libphoenix
*
* syscalls (sparcv8leon3)
* syscalls (sparcv8leon)
*
* Copyright 2022 Phoenix Systems
* Author: Lukasz Leczkowski
Expand Down
9 changes: 0 additions & 9 deletions arch/sparcv8leon3/Makefile

This file was deleted.

2 changes: 1 addition & 1 deletion include/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#elif defined(__riscv) && (__riscv_xlen == 64)
#include <arch/riscv64/arch.h>
#elif defined(__sparc__)
#include <arch/sparcv8leon3/arch.h>
#include <arch/sparcv8leon/arch.h>
#else
#error "unsupported architecture"
#endif
2 changes: 1 addition & 1 deletion include/arch/setjmp.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#elif defined(__riscv) && (__riscv_xlen == 64)
#include <arch/riscv64/setjmp.h>
#elif defined(__sparc__)
#include <arch/sparcv8leon3/setjmp.h>
#include <arch/sparcv8leon/setjmp.h>
#else
#error "unsupported architecture"
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* libphoenix
*
* Architecture dependent part (arch/sparcv8leon3)
* Architecture dependent part (arch/sparcv8leon)
*
* Copyright 2022 Phoenix Systems
* Author: Lukasz Leczkowski
Expand All @@ -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 <arch/sparcv8leon3/stdint.h>
#define __ARCH_LIMITS <arch/sparcv8leon3/limits.h>
#define __ARCH_STDINT <arch/sparcv8leon/stdint.h>
#define __ARCH_LIMITS <arch/sparcv8leon/limits.h>

#define __MEMCPY
#define __MEMCMP
Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <phoenix/arch/sparcv8leon3/stdtypes.h>
#include <phoenix/arch/sparcv8leon/stdtypes.h>


struct __jmp_buf {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 <phoenix/arch/sparcv8leon3/stdtypes.h>
#include <phoenix/arch/sparcv8leon/stdtypes.h>

/* The following sections refer to ISO/IEC 9899:1999 */

Expand Down
Loading