Skip to content

R
riscv-gcc-1
Commit 7262646b by Iain Buclaw
Options

Backport PRs 90059, 90060, 90062 

	PR d/90059
	PR d/90060
	PR d/90062
libphobos: Merge upstream druntime 70b9fea6

Backports fixes in the extern(C) bindings for the Solaris/SPARC port.

Initial patch by Rainer Orth.

Reviewed-on: https://github.com/dlang/druntime/pull/2555

From-SVN: r270372
parent b7a9e9f4
Showing with 137 additions and 25 deletions
libphobos/libdruntime/MERGE
175bf5fc69d26fec60d533ff77f7e915fd5bb468 70b9fea60246e63d936ad6826b1b48b6e0f1de8f
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the dlang/druntime repository. merge done from the dlang/druntime repository.
libphobos/libdruntime/core/sys/posix/ucontext.d
...@@ -25,6 +25,10 @@ nothrow: ...@@ -25,6 +25,10 @@ nothrow:
version (RISCV32) version = RISCV_Any; version (RISCV32) version = RISCV_Any;
version (RISCV64) version = RISCV_Any; version (RISCV64) version = RISCV_Any;
version (SPARC) version = SPARC_Any;
version (SPARC64) version = SPARC_Any;
version (X86) version = X86_Any;
version (X86_64) version = X86_Any;
// //
// XOpen (XSI) // XOpen (XSI)
...@@ -1029,6 +1033,8 @@ else version (DragonFlyBSD) ...@@ -1029,6 +1033,8 @@ else version (DragonFlyBSD)
} }
else version (Solaris) else version (Solaris)
{ {
private import core.stdc.stdint;
alias uint[4] upad128_t; alias uint[4] upad128_t;
version (SPARC64) version (SPARC64)
...@@ -1127,10 +1133,13 @@ else version (Solaris) ...@@ -1127,10 +1133,13 @@ else version (Solaris)
} }
else version (X86_64) else version (X86_64)
{ {
union _u_st private
{ {
ushort[5] fpr_16; union _u_st
upad128_t __fpr_pad; {
ushort[5] fpr_16;
upad128_t __fpr_pad;
}
} }
struct fpregset_t struct fpregset_t
...@@ -1189,20 +1198,94 @@ else version (Solaris) ...@@ -1189,20 +1198,94 @@ else version (Solaris)
else else
static assert(0, "unimplemented"); static assert(0, "unimplemented");
struct mcontext_t version (SPARC_Any)
{ {
gregset_t gregs; private
fpregset_t fpregs; {
struct rwindow
{
greg_t[8] rw_local;
greg_t[8] rw_in;
}
struct gwindows_t
{
int wbcnt;
greg_t[31] *spbuf;
rwindow[31] wbuf;
}
struct xrs_t
{
uint xrs_id;
caddr_t xrs_ptr;
}
struct cxrs_t
{
uint cxrs_id;
caddr_t cxrs_ptr;
}
alias int64_t[16] asrset_t;
}
struct mcontext_t
{
gregset_t gregs;
gwindows_t *gwins;
fpregset_t fpregs;
xrs_t xrs;
version (SPARC64)
{
asrset_t asrs;
cxrs_t cxrs;
c_long[2] filler;
}
else version (SPARC)
{
cxrs_t cxrs;
c_long[17] filler;
}
}
}
else version (X86_Any)
{
private
{
struct xrs_t
{
uint xrs_id;
caddr_t xrs_ptr;
}
}
struct mcontext_t
{
gregset_t gregs;
fpregset_t fpregs;
}
} }
struct ucontext_t struct ucontext_t
{ {
c_ulong uc_flags; version (SPARC_Any)
uint uc_flags;
else version (X86_Any)
c_ulong uc_flags;
ucontext_t *uc_link; ucontext_t *uc_link;
sigset_t uc_sigmask; sigset_t uc_sigmask;
stack_t uc_stack; stack_t uc_stack;
mcontext_t uc_mcontext; mcontext_t uc_mcontext;
c_long[5] uc_filler; version (SPARC64)
c_long[4] uc_filler;
else version (SPARC)
c_long[23] uc_filler;
else version (X86_Any)
{
xrs_t uc_xrs;
c_long[3] uc_filler;
}
} }
} }
else version (CRuntime_UClibc) else version (CRuntime_UClibc)
...@@ -1399,7 +1482,20 @@ int swapcontext(ucontext_t*, in ucontext_t*); ...@@ -1399,7 +1482,20 @@ int swapcontext(ucontext_t*, in ucontext_t*);
static if ( is( ucontext_t ) ) static if ( is( ucontext_t ) )
{ {
int getcontext(ucontext_t*); int getcontext(ucontext_t*);
void makecontext(ucontext_t*, void function(), int, ...);
version (Solaris)
{
version (SPARC_Any)
{
void __makecontext_v2(ucontext_t*, void function(), int, ...);
alias makecontext = __makecontext_v2;
}
else
void makecontext(ucontext_t*, void function(), int, ...);
}
else
void makecontext(ucontext_t*, void function(), int, ...);
int setcontext(in ucontext_t*); int setcontext(in ucontext_t*);
int swapcontext(ucontext_t*, in ucontext_t*); int swapcontext(ucontext_t*, in ucontext_t*);
} }
......
libphobos/libdruntime/core/sys/solaris/link.d
...@@ -27,12 +27,12 @@ void ld_section(in char*, Elf32_Shdr*, Elf32_Word, Elf_Data*, Elf*); ...@@ -27,12 +27,12 @@ void ld_section(in char*, Elf32_Shdr*, Elf32_Word, Elf_Data*, Elf*);
version (D_LP64) version (D_LP64)
{ {
void ld_start64(in char*, in Elf64_Half, in char*); void ld_start64(in char*, in Elf64_Half, in char*);
void ld_atexit64(int); void ld_atexit64(int);
void ld_open64(in char**, in char**, int*, int, Elf**, Elf*, size_t, in Elf_Kind); void ld_open64(in char**, in char**, int*, int, Elf**, Elf*, size_t, in Elf_Kind);
void ld_file64(in char*, in Elf_Kind, int, Elf*); void ld_file64(in char*, in Elf_Kind, int, Elf*);
void ld_input_section64(in char*, Elf64_Shdr**, Elf64_Word, Elf_Data*, Elf*, uint*); void ld_input_section64(in char*, Elf64_Shdr**, Elf64_Word, Elf_Data*, Elf*, uint*);
void ld_section64(in char*, Elf64_Shdr*, Elf64_Word, Elf_Data*, Elf*); void ld_section64(in char*, Elf64_Shdr*, Elf64_Word, Elf_Data*, Elf*);
} }
enum LD_SUP_VNONE = 0; enum LD_SUP_VNONE = 0;
...@@ -137,17 +137,21 @@ int la_objfilter(uintptr_t*, in char*, uintptr_t*, uint); ...@@ -137,17 +137,21 @@ int la_objfilter(uintptr_t*, in char*, uintptr_t*, uint);
version (D_LP64) version (D_LP64)
{ {
uintptr_t la_amd64_pltenter(Elf64_Sym*, uint, uintptr_t*, uintptr_t*, La_amd64_regs*, uint*, in char*); uintptr_t la_amd64_pltenter(Elf64_Sym*, uint, uintptr_t*, uintptr_t*,
uintptr_t la_symbind64(Elf64_Sym*, uint, uintptr_t*, uintptr_t*, uint*, in char*); La_amd64_regs*, uint*, in char*);
uintptr_t la_sparcv9_pltenter(Elf64_Sym*, uint, uintptr_t*, uintptr_t*, La_sparcv9_regs*, uint*, in char*); uintptr_t la_symbind64(Elf64_Sym*, uint, uintptr_t*, uintptr_t*, uint*, in char*);
uintptr_t la_pltexit64(Elf64_Sym*, uint, uintptr_t*, uintptr_t*, uintptr_t, in char*); uintptr_t la_sparcv9_pltenter(Elf64_Sym*, uint, uintptr_t*, uintptr_t*,
La_sparcv9_regs*, uint*, in char*);
uintptr_t la_pltexit64(Elf64_Sym*, uint, uintptr_t*, uintptr_t*, uintptr_t, in char*);
} }
else else
{ {
uintptr_t la_symbind32(Elf32_Sym*, uint, uintptr_t*, uintptr_t*, uint*); uintptr_t la_symbind32(Elf32_Sym*, uint, uintptr_t*, uintptr_t*, uint*);
uintptr_t la_sparcv8_pltenter(Elf32_Sym*, uint, uintptr_t*, uintptr_t*, La_sparcv8_regs*, uint*); uintptr_t la_sparcv8_pltenter(Elf32_Sym*, uint, uintptr_t*, uintptr_t*,
uintptr_t la_i86_pltenter(Elf32_Sym*, uint, uintptr_t*, uintptr_t*, La_i86_regs*, uint*); La_sparcv8_regs*, uint*);
uintptr_t la_pltexit(Elf32_Sym*, uint, uintptr_t*, uintptr_t*, uintptr_t); uintptr_t la_i86_pltenter(Elf32_Sym*, uint, uintptr_t*, uintptr_t*,
La_i86_regs*, uint*);
uintptr_t la_pltexit(Elf32_Sym*, uint, uintptr_t*, uintptr_t*, uintptr_t);
} }
template ElfW(string type) template ElfW(string type)
...@@ -158,13 +162,16 @@ template ElfW(string type) ...@@ -158,13 +162,16 @@ template ElfW(string type)
mixin("alias Elf32_"~type~" ElfW;"); mixin("alias Elf32_"~type~" ElfW;");
} }
struct dl_phdr_info { struct dl_phdr_info
{
ElfW!"Addr" dlpi_addr; ElfW!"Addr" dlpi_addr;
char* dlpi_name; char* dlpi_name;
ElfW!"Phdr"* dlpi_phdr; ElfW!"Phdr"* dlpi_phdr;
ElfW!"Half" dlpi_phnum; ElfW!"Half" dlpi_phnum;
uint64_t dlpi_adds; uint64_t dlpi_adds;
uint64_t dlpi_subs; uint64_t dlpi_subs;
size_t dlpi_tls_modid; // since Solaris 11.5
void* dlpi_tls_data; // since Solaris 11.5
}; };
private alias extern(C) int function(dl_phdr_info*, size_t, void *) dl_iterate_phdr_cb; private alias extern(C) int function(dl_phdr_info*, size_t, void *) dl_iterate_phdr_cb;
......
libphobos/libdruntime/core/thread.d
...@@ -3615,6 +3615,15 @@ private ...@@ -3615,6 +3615,15 @@ private
version = AsmExternal; version = AsmExternal;
} }
} }
else version (SPARC)
{
// NOTE: The SPARC ABI specifies only doubleword alignment.
version = AlignFiberStackTo16Byte;
}
else version (SPARC64)
{
version = AlignFiberStackTo16Byte;
}
version (Posix) version (Posix)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment