musl-1.2.4-elfutils-0.190-relr.patch 2.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374
  1. https://www.openwall.com/lists/musl/2023/11/06/3
  2. https://inbox.vuxu.org/musl/20231106113336.3664-2-ncopa@alpinelinux.org/T/#u
  3. https://sourceware.org/bugzilla/show_bug.cgi?id=31034
  4. https://bugs.gentoo.org/916857
  5. From mboxrd@z Thu Jan 1 00:00:00 1970
  6. X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
  7. X-Spam-Level:
  8. X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
  9. MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3,
  10. RCVD_IN_MSPIKE_WL,T_SCC_BODY_TEXT_LINE autolearn=ham
  11. autolearn_force=no version=3.4.4
  12. Received: (qmail 5179 invoked from network); 6 Nov 2023 11:46:34 -0000
  13. Received: from second.openwall.net (193.110.157.125)
  14. by inbox.vuxu.org with ESMTPUTF8; 6 Nov 2023 11:46:34 -0000
  15. Received: (qmail 30570 invoked by uid 550); 6 Nov 2023 11:46:29 -0000
  16. Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm
  17. Precedence: bulk
  18. List-Post: <mailto:musl@lists.openwall.com>
  19. List-Help: <mailto:musl-help@lists.openwall.com>
  20. List-Unsubscribe: <mailto:musl-unsubscribe@lists.openwall.com>
  21. List-Subscribe: <mailto:musl-subscribe@lists.openwall.com>
  22. List-ID: <musl.lists.openwall.com>
  23. Reply-To: musl@lists.openwall.com
  24. Received: (qmail 30538 invoked from network); 6 Nov 2023 11:46:29 -0000
  25. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alpinelinux.org;
  26. s=smtp; t=1699271177;
  27. h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
  28. to:to:cc:cc:mime-version:mime-version:
  29. content-transfer-encoding:content-transfer-encoding;
  30. bh=73HDLjg72r1JGckDGbEyPxYrYL7dC7MB3gMwy/yp7hc=;
  31. b=pSGCs/DrFDbs9eEA89un578pZbyzpmTw81QGH7xK4ZAAkYiXx1ysaXlsllwxGd076F+plw
  32. kE1QbGVndutc+ieeUOiHomF4O8IP4AqO/8xCy52LlYmnhMTcxgoXD/GWHfVcXmIgFb+8Uc
  33. jvgM9nXFOXceFSlHLLOwJBQFE2dyBrU=
  34. From: Natanael Copa <ncopa@alpinelinux.org>
  35. To: musl@lists.openwall.com
  36. Cc: Natanael Copa <ncopa@alpinelinux.org>
  37. Date: Mon, 6 Nov 2023 12:33:37 +0100
  38. Message-ID: <20231106113336.3664-2-ncopa@alpinelinux.org>
  39. X-Mailer: git-send-email 2.42.1
  40. MIME-Version: 1.0
  41. Content-Transfer-Encoding: 8bit
  42. Subject: [musl] [PATCH] elf.h: add typedefs for Elf*_Relr
  43. Add typedefs for Elf32_Relr and Elf64_Relr as a follow-up to commit
  44. d32dadd60efb (ldso: support DT_RELR relative relocation format)
  45. ---
  46. This fixes build of iproute2 with elfutils 0.190, which assumes that
  47. Elf*_Relr are typedef'ed when SHT_RELR is defined.
  48. ref: https://sourceware.org/git/?p=elfutils.git;a=commit;h=39f2c500542f69c2f1a13fd0ae4eaa5778d2ed8d
  49. ref: https://sourceware.org/bugzilla/show_bug.cgi?id=31034
  50. include/elf.h | 3 +++
  51. 1 file changed, 3 insertions(+)
  52. diff --git a/include/elf.h b/include/elf.h
  53. index 23f2c4bc..aa186d9d 100644
  54. --- a/include/elf.h
  55. +++ b/include/elf.h
  56. @@ -32,6 +32,9 @@ typedef uint16_t Elf64_Section;
  57. typedef Elf32_Half Elf32_Versym;
  58. typedef Elf64_Half Elf64_Versym;
  59. +typedef Elf32_Word Elf32_Relr;
  60. +typedef Elf64_Xword Elf64_Relr;
  61. +
  62. #define EI_NIDENT (16)
  63. typedef struct {
  64. --
  65. 2.42.1