diff mbox series

[RFC,V2,19/38] riscv: s64ilp32: Add ELF32 support

Message ID	20231112061514.2306187-20-guoren@kernel.org (mailing list archive)
State	RFC
Headers	show Return-Path: <linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org> From: guoren@kernel.org To: arnd@arndb.de, guoren@kernel.org, palmer@rivosinc.com, tglx@linutronix.de, conor.dooley@microchip.com, heiko@sntech.de, apatel@ventanamicro.com, atishp@atishpatra.org, bjorn@kernel.org, paul.walmsley@sifive.com, anup@brainfault.org, jiawei@iscas.ac.cn, liweiwei@iscas.ac.cn, wefu@redhat.com, U2FsdGVkX1@gmail.com, wangjunqiang@iscas.ac.cn, kito.cheng@sifive.com, andy.chiu@sifive.com, vincent.chen@sifive.com, greentime.hu@sifive.com, wuwei2016@iscas.ac.cn, jrtc27@jrtc27.com, luto@kernel.org, fweimer@redhat.com, catalin.marinas@arm.com, hjl.tools@gmail.com Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Guo Ren <guoren@linux.alibaba.com>, Guo Ren <guoren@kerenl.org> Subject: [RFC PATCH V2 19/38] riscv: s64ilp32: Add ELF32 support Date: Sun, 12 Nov 2023 01:14:55 -0500 Message-Id: <20231112061514.2306187-20-guoren@kernel.org> In-Reply-To: <20231112061514.2306187-1-guoren@kernel.org> References: <20231112061514.2306187-1-guoren@kernel.org> MIME-Version: 1.0 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" <linux-riscv-bounces@lists.infradead.org> Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org
Series	rv64ilp32: Running ILP32 on RV64 ISA \| expand [RFC,V2,00/38] rv64ilp32: Running ILP32 on RV64 ISA [RFC,V2,01/38] riscv: u64ilp32: Unify vdso32 & compat_vdso into vdso/Makefile [RFC,V2,02/38] riscv: u64ilp32: Remove compat_vdso/ [RFC,V2,03/38] riscv: u64ilp32: Add time-related vDSO common flow for vdso32 [RFC,V2,04/38] riscv: u64ilp32: Introduce ILP32 vdso for UXL=64 [RFC,V2,05/38] riscv: u64ilp32: Adjust vDSO kernel flow for 64ilp32 abi [RFC,V2,06/38] riscv: u64ilp32: Add signal support for compat [RFC,V2,07/38] riscv: u64ilp32: Add ptrace interface support [RFC,V2,08/38] riscv: u64ilp32: Adjust vDSO alternative for 64ilp32 abi [RFC,V2,09/38] riscv: u64ilp32: Add xlen_t in user_regs_struct [RFC,V2,10/38] riscv: u64ilp32: Remove the restriction of UXL=32 [RFC,V2,11/38] riscv: u64ilp32: Enable user space runtime switch [RFC,V2,12/38] riscv: s64ilp32: Unify ULL & UL into UXL in csr [RFC,V2,13/38] riscv: s64ilp32: Introduce xlen_t for 64ILP32 kernel [RFC,V2,14/38] riscv: s64ilp32: Add sbi support [RFC,V2,15/38] riscv: s64ilp32: Add asid support [RFC,V2,16/38] riscv: s64ilp32: Introduce PTR_L and PTR_S [RFC,V2,17/38] riscv: s64ilp32: Adjust TASK_SIZE for s64ilp32 kernel [RFC,V2,18/38] riscv: s64ilp32: Add ebpf jit support [RFC,V2,19/38] riscv: s64ilp32: Add ELF32 support [RFC,V2,20/38] riscv: s64ilp32: Add ARCH_RV64ILP32 Kconfig option [RFC,V2,21/38] riscv: s64ilp32: Add MMU_SV32 mode support [RFC,V2,22/38] riscv: s64ilp32: Add MMU_SV39 mode support [RFC,V2,23/38] riscv: s64ilp32: Enable native atomic64 [RFC,V2,24/38] riscv: s64ilp32: Add TImode (128 int) support [RFC,V2,25/38] riscv: s64ilp32: Implement cmpxchg_double [RFC,V2,26/38] riscv: s64ilp32: Disable KVM [RFC,V2,27/38] riscv: s64ilp32: Correct the rv64ilp32 stackframe layout [RFC,V2,28/38] riscv: s64ilp32: Temporary workaround solution to gcc problem [RFC,V2,29/38] riscv: s64ilp32: Introduce ARCH_HAS_64ILP32_KERNEL for syscall [RFC,V2,30/38] riscv: s64ilp32: Add u32ilp32 ptrace support [RFC,V2,31/38] riscv: s64ilp32: Add u32ilp32 signal support [RFC,V2,32/38] riscv: s64ilp32: Validate harts by architecture name [RFC,V2,33/38] riscv: s64ilp32: Add rv64ilp32_defconfig [RFC,V2,34/38] riscv: Cleanup rv32_defconfig [RFC,V2,35/38] clocksource: riscv: s64ilp32: Use __riscv_xlen instead of CONFIG_32BIT [RFC,V2,36/38] irqchip: riscv: s64ilp32: Use __riscv_xlen instead of CONFIG_32BIT [RFC,V2,37/38] add tinylab defconfig [RFC,V2,38/38] 64ilp32 v.s. 64lp64

Checks

Context	Check	Description
conchuod/vmtest-fixes-PR	fail	merge-conflict

Commit Message

Guo Ren Nov. 12, 2023, 6:14 a.m. UTC

From: Guo Ren <guoren@linux.alibaba.com>

Use abi_len to distinct ELF32 and ELF64 because s64ilp32 is xlen=64 and
abi_len=32 (__SIZEOF_POINTER__=4). And s64ilp32 is an ELF32 based the
same as s32ilp32.

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Guo Ren <guoren@kerenl.org>
---
 arch/riscv/include/uapi/asm/elf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/arch/riscv/include/uapi/asm/elf.h b/arch/riscv/include/uapi/asm/elf.h
index d696d6610231..962e8ec8fe05 100644
--- a/arch/riscv/include/uapi/asm/elf.h
+++ b/arch/riscv/include/uapi/asm/elf.h
@@ -24,7 +24,7 @@  typedef __u64 elf_fpreg_t;
 typedef union __riscv_fp_state elf_fpregset_t;
 #define ELF_NFPREG (sizeof(struct __riscv_d_ext_state) / sizeof(elf_fpreg_t))
 
-#if __riscv_xlen == 64
+#if __SIZEOF_POINTER__ == 8
 #define ELF_RISCV_R_SYM(r_info)		ELF64_R_SYM(r_info)
 #define ELF_RISCV_R_TYPE(r_info)	ELF64_R_TYPE(r_info)
 #else