From 6bf133dc5f23b4b6f041a964100e2efd137b8d27 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 22 Mar 2024 20:46:52 +0000 Subject: [PATCH] Remove duplicate ELF_ST_TYPE() macro. The Linux uapi header fixed their definition in 5.19 to not have the cast that we were working around here. (See https://lkml.kernel.org/r/Ymv7G1BeX4kt3obz@localhost.localdomain for the upstream patch.) Change-Id: Ied3368551ebb82f44f411684fe3666d06efbd22e --- libc/include/elf.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libc/include/elf.h b/libc/include/elf.h index d25044401..bb3c61ae2 100644 --- a/libc/include/elf.h +++ b/libc/include/elf.h @@ -207,8 +207,6 @@ typedef Elf64_Xword Elf64_Relr; #define ELF64_R_INFO(sym, type) ((((Elf64_Xword)sym) << 32) | ((type) & 0xffffffff)) /* http://www.sco.com/developers/gabi/latest/ch4.symtab.html */ -#undef ELF_ST_TYPE -#define ELF_ST_TYPE(x) ((x) & 0xf) #define ELF_ST_INFO(b,t) (((b) << 4) + ((t) & 0xf)) #define ELF32_ST_INFO(b,t) ELF_ST_INFO(b,t) #define ELF64_ST_INFO(b,t) ELF_ST_INFO(b,t)