ObjectFileELF: delete local NT_* macro definitions

[MaskRay]

Summary

Most are not used in the file. The definition NT_FILE is provided by
Plugins/Process/elf-core/RegisterUtilities.h

[labath]

I think you need to update your local checkout. I just deleted these yesterday. :)

(And FTR, I don't think a dependency from an ObjectFile plugin to Process/Utility would be correct anyway)

[MaskRay]

I came to check lldb after I saw a llvm-readobj patch. Indeed NT_* were removed in D65927.

(My lldb repository had modified files in the working tree so git pull didn't pull latest changes.)

source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp

 //===-- ObjectFileELF.cpp ------------------------------------- -*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "ObjectFileELF.h"
 
 #include <algorithm>
 #include <cassert>
 #include <unordered_map>
 
+#include "Plugins/Process/elf-core/RegisterUtilities.h"
+
 #include "lldb/Core/FileSpecList.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Symbol/DWARFCallFrameInfo.h"
 #include "lldb/Symbol/SymbolContext.h"

 const elf_word LLDB_NT_NETBSD_IDENT_NAMESZ = 7;
 const elf_word LLDB_NT_NETBSD_PROCINFO = 1;
 
 // GNU ABI note OS constants
 const elf_word LLDB_NT_GNU_ABI_OS_LINUX = 0x00;
 const elf_word LLDB_NT_GNU_ABI_OS_HURD = 0x01;
 const elf_word LLDB_NT_GNU_ABI_OS_SOLARIS = 0x02;
 
-// LLDB_NT_OWNER_CORE and LLDB_NT_OWNER_LINUX note contants
-#define NT_PRSTATUS 1
-#define NT_PRFPREG 2
-#define NT_PRPSINFO 3
-#define NT_TASKSTRUCT 4
-#define NT_AUXV 6
-#define NT_SIGINFO 0x53494749
-#define NT_FILE 0x46494c45
-#define NT_PRXFPREG 0x46e62b7f
-#define NT_PPC_VMX 0x100
-#define NT_PPC_SPE 0x101
-#define NT_PPC_VSX 0x102
-#define NT_386_TLS 0x200
-#define NT_386_IOPERM 0x201
-#define NT_X86_XSTATE 0x202
-#define NT_S390_HIGH_GPRS 0x300
-#define NT_S390_TIMER 0x301
-#define NT_S390_TODCMP 0x302
-#define NT_S390_TODPREG 0x303
-#define NT_S390_CTRS 0x304
-#define NT_S390_PREFIX 0x305
-#define NT_S390_LAST_BREAK 0x306
-#define NT_S390_SYSTEM_CALL 0x307
-#define NT_S390_TDB 0x308
-#define NT_S390_VXRS_LOW 0x309
-#define NT_S390_VXRS_HIGH 0x30a
-#define NT_ARM_VFP 0x400
-#define NT_ARM_TLS 0x401
-#define NT_ARM_HW_BREAK 0x402
-#define NT_ARM_HW_WATCH 0x403
-#define NT_ARM_SYSTEM_CALL 0x404
-#define NT_METAG_CBUF 0x500
-#define NT_METAG_RPIPE 0x501
-#define NT_METAG_TLS 0x502
-
 //===----------------------------------------------------------------------===//
 /// \class ELFRelocation
 /// Generic wrapper for ELFRel and ELFRela.
 ///
 /// This helper class allows us to parse both ELFRel and ELFRela relocation
 /// entries in a generic manner.
 class ELFRelocation {
 public:
else if (note.n_name == LLDB_NT_OWNER_OPENBSD) {
       // 0x00007fa79cdab000 0x00007fa79cdad000 0x00000000000001be /lib/x86_64
       // -linux-gnu/libc-2.19.so [  7] 0x00007fa79cdb2000 0x00007fa79cdd5000
       // 0x0000000000000000 /lib/x86_64-linux-gnu/ld-2.19.so [  8]
       // 0x00007fa79cfd4000 0x00007fa79cfd5000 0x0000000000000022 /lib/x86_64
       // -linux-gnu/ld-2.19.so [  9] 0x00007fa79cfd5000 0x00007fa79cfd6000
       // 0x0000000000000023 /lib/x86_64-linux-gnu/ld-2.19.so In the 32 bit ELFs
       // the count, page_size, start, end, file_ofs are uint32_t For reference:
       // see readelf source code (in binutils).
-      if (note.n_type == NT_FILE) {
+      if (note.n_type == LINUX::NT_FILE) {
         uint64_t count = data.GetAddress(&offset);
         const char *cstr;
         data.GetAddress(&offset); // Skip page size
         offset += count * 3 *
                   data.GetAddressByteSize(); // Skip all start/end/file_ofs
         for (size_t i = 0; i < count; ++i) {
           cstr = data.GetCStr(&offset);
           if (cstr == nullptr) {