Skip to content

Commit

Permalink
fix: add elf.h patch for new typedefs
Browse files Browse the repository at this point in the history
Required for updated stuff in `tools`.

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
smira committed Nov 28, 2023
1 parent f5fec76 commit cc75d0e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
30 changes: 30 additions & 0 deletions musl/patches/elf.h-add-typedefs.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
https://gitlab.alpinelinux.org/alpine/aports/-/raw/master/main/musl/0001-elf.h-add-typedefs-for-Elf-_Relr.patch

From 981144ebc9ff30b085af107f1337543de7b0bf94 Mon Sep 17 00:00:00 2001
From: Natanael Copa <[email protected]>
Date: Mon, 6 Nov 2023 12:29:16 +0100
Subject: [PATCH] elf.h: add typedefs for Elf*_Relr

Add typedefs for Elf32_Relr and Elf64_relr as a follow-up to commit
d32dadd60efb (ldso: support DT_RELR relative relocation format)
---
include/elf.h | 3 +++
1 file changed, 3 insertions(+)

diff --git a/include/elf.h b/include/elf.h
index 23f2c4bc..aa186d9d 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -32,6 +32,9 @@ typedef uint16_t Elf64_Section;
typedef Elf32_Half Elf32_Versym;
typedef Elf64_Half Elf64_Versym;

+typedef Elf32_Word Elf32_Relr;
+typedef Elf64_Xword Elf64_Relr;
+
#define EI_NIDENT (16)

typedef struct {
--
2.42.1

1 change: 1 addition & 0 deletions musl/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ steps:
tar -xzf musl.tar.gz --strip-components=1
patch -p1 < /pkg/patches/revert-faccessat2.patch
patch -p1 < /pkg/patches/elf.h-add-typedefs.patch
mkdir build
cd build
Expand Down

0 comments on commit cc75d0e

Please sign in to comment.