commit 0339184afc35b228bd9c97842c8b49079e41b8a2
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 22 22:21:00 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 22 22:21:00 2024 +0000
tree f49fd32805b9956271d7ca8898e713c0c320a391
parent 2a70ee680c6db687e3dbb00c0fa56634bb75b314
parent 6bf133dc5f23b4b6f041a964100e2efd137b8d27

Merge "Remove duplicate ELF_ST_TYPE() macro." into main

libc/include/elf.h

diff --git a/libc/include/elf.h b/libc/include/elf.h
index d250444..bb3c61a 100644
--- a/libc/include/elf.h
+++ b/libc/include/elf.h
@@ -207,8 +207,6 @@
 #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)