Skip to content

Commit fd292b7

Browse files
ibuclawdlang-bot
authored andcommitted
core.sys.solaris.sys.link: Move shared ELF values to core.sys.elf
1 parent f89da31 commit fd292b7

File tree

12 files changed

+107
-266
lines changed

12 files changed

+107
-266
lines changed

src/core/sys/dragonflybsd/sys/elf32.d

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ alias Elf32_Word Elf32_Hashelt;
1818
alias Elf32_Word Elf32_Size;
1919
alias Elf32_Sword Elf32_Ssize;
2020

21+
struct Elf32_Dyn
22+
{
23+
Elf32_Sword d_tag;
24+
union _d_un
25+
{
26+
Elf32_Word d_val;
27+
Elf32_Addr d_ptr;
28+
} _d_un d_un;
29+
}
30+
2131
alias Elf_Note Elf32_Nhdr;
2232

2333
struct Elf32_Cap

src/core/sys/dragonflybsd/sys/elf64.d

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ alias Elf64_Word Elf64_Hashelt;
1818
alias Elf64_Xword Elf64_Size;
1919
alias Elf64_Sxword Elf64_Ssize;
2020

21+
struct Elf64_Dyn
22+
{
23+
Elf64_Sxword d_tag;
24+
union _d_un
25+
{
26+
Elf64_Xword d_val;
27+
Elf64_Addr d_ptr;
28+
} _d_un d_un;
29+
}
30+
2131
extern (D) pure
2232
{
2333
auto ELF64_R_TYPE_DATA(I)(I i) { return (cast(Elf64_Xword) i << 32) >> 40; }

src/core/sys/elf/package.d

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -617,26 +617,6 @@ enum PF_R = (1 << 2);
617617
enum PF_MASKOS = 0x0ff00000;
618618
enum PF_MASKPROC = 0xf0000000;
619619

620-
struct Elf32_Dyn
621-
{
622-
Elf32_Sword d_tag;
623-
union _d_un
624-
{
625-
Elf32_Word d_val;
626-
Elf32_Addr d_ptr;
627-
} _d_un d_un;
628-
}
629-
630-
struct Elf64_Dyn
631-
{
632-
Elf64_Sxword d_tag;
633-
union _d_un
634-
{
635-
Elf64_Xword d_val;
636-
Elf64_Addr d_ptr;
637-
} _d_un d_un;
638-
}
639-
640620
enum DT_NULL = 0;
641621
enum DT_NEEDED = 1;
642622
enum DT_PLTRELSZ = 2;

src/core/sys/freebsd/sys/elf32.d

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ alias Elf32_Word Elf32_Hashelt;
1818
alias Elf32_Word Elf32_Size;
1919
alias Elf32_Sword Elf32_Ssize;
2020

21+
struct Elf32_Dyn
22+
{
23+
Elf32_Sword d_tag;
24+
union _d_un
25+
{
26+
Elf32_Word d_val;
27+
Elf32_Addr d_ptr;
28+
} _d_un d_un;
29+
}
30+
2131
alias Elf_Note Elf32_Nhdr;
2232

2333
struct Elf32_Cap

src/core/sys/freebsd/sys/elf64.d

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ alias Elf64_Word Elf64_Hashelt;
1818
alias Elf64_Xword Elf64_Size;
1919
alias Elf64_Sxword Elf64_Ssize;
2020

21+
struct Elf64_Dyn
22+
{
23+
Elf64_Sxword d_tag;
24+
union _d_un
25+
{
26+
Elf64_Xword d_val;
27+
Elf64_Addr d_ptr;
28+
} _d_un d_un;
29+
}
30+
2131
extern (D)
2232
{
2333
auto ELF64_R_TYPE_DATA(I)(I i) { return (cast(Elf64_Xword) i << 32) >> 40; }

src/core/sys/linux/elf.d

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,26 @@ enum NT_ARM_HW_WATCH = 0x403;
7575

7676
enum NT_VERSION = 1;
7777

78+
struct Elf32_Dyn
79+
{
80+
Elf32_Sword d_tag;
81+
union _d_un
82+
{
83+
Elf32_Word d_val;
84+
Elf32_Addr d_ptr;
85+
} _d_un d_un;
86+
}
87+
88+
struct Elf64_Dyn
89+
{
90+
Elf64_Sxword d_tag;
91+
union _d_un
92+
{
93+
Elf64_Xword d_val;
94+
Elf64_Addr d_ptr;
95+
} _d_un d_un;
96+
}
97+
7898
enum NT_GNU_ABI_TAG = 1;
7999
enum NT_GNU_HWCAP = 2;
80100
enum NT_GNU_BUILD_ID = 3;

src/core/sys/netbsd/sys/elf32.d

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ alias Elf32_Word Elf32_Hashelt;
1818
alias Elf32_Word Elf32_Size;
1919
alias Elf32_Sword Elf32_Ssize;
2020

21+
struct Elf32_Dyn
22+
{
23+
Elf32_Sword d_tag;
24+
union _d_un
25+
{
26+
Elf32_Word d_val;
27+
Elf32_Addr d_ptr;
28+
} _d_un d_un;
29+
}
30+
2131
alias Elf_Note Elf32_Nhdr;
2232

2333
struct Elf32_Cap

src/core/sys/netbsd/sys/elf64.d

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ alias Elf64_Word Elf64_Hashelt;
1818
alias Elf64_Xword Elf64_Size;
1919
alias Elf64_Sxword Elf64_Ssize;
2020

21+
struct Elf64_Dyn
22+
{
23+
Elf64_Sxword d_tag;
24+
union _d_un
25+
{
26+
Elf64_Xword d_val;
27+
Elf64_Addr d_ptr;
28+
} _d_un d_un;
29+
}
30+
2131
extern (D)
2232
{
2333
auto ELF64_R_TYPE_DATA(I)(I i) { return (cast(Elf64_Xword) i << 32) >> 40; }

src/core/sys/openbsd/sys/elf32.d

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ alias Elf32_Word Elf32_Hashelt;
1919
alias Elf32_Word Elf32_Size;
2020
alias Elf32_Sword Elf32_Ssize;
2121

22+
struct Elf32_Dyn
23+
{
24+
Elf32_Sword d_tag;
25+
union _d_un
26+
{
27+
Elf32_Word d_val;
28+
Elf32_Addr d_ptr;
29+
} _d_un d_un;
30+
}
31+
2232
alias Elf_Note Elf32_Nhdr;
2333

2434
struct Elf32_Cap

src/core/sys/openbsd/sys/elf64.d

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ alias Elf64_Word Elf64_Hashelt;
1919
alias Elf64_Xword Elf64_Size;
2020
alias Elf64_Sxword Elf64_Ssize;
2121

22+
struct Elf64_Dyn
23+
{
24+
Elf64_Sxword d_tag;
25+
union _d_un
26+
{
27+
Elf64_Xword d_val;
28+
Elf64_Addr d_ptr;
29+
} _d_un d_un;
30+
}
31+
2232
extern (D) pure
2333
{
2434
auto ELF64_R_TYPE_DATA(I)(I i) { return (cast(Elf64_Xword) i << 32) >> 40; }

0 commit comments

Comments
 (0)