[llvm-branch-commits] [llvm] [llvm-objcopy] Support CREL (PR #97521)

[Fangrui Song via llvm-branch-commits]

https://github.com/MaskRay updated https://github.com/llvm/llvm-project/pull/97521

>From 9bedda3fa950fbb418a53945f6e36da9a7582e3b Mon Sep 17 00:00:00 2001
From: Fangrui Song <i at maskray.me>
Date: Wed, 3 Jul 2024 11:45:26 -0700
Subject: [PATCH 1/2] fix header

Created using spr 1.3.5-bogner
---
 llvm/include/llvm/ADT/bit.h        | 1 -
 llvm/include/llvm/MC/MCELFExtras.h | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/include/llvm/ADT/bit.h b/llvm/include/llvm/ADT/bit.h
index 1c8bd46648256..c42b5e686bdc9 100644
--- a/llvm/include/llvm/ADT/bit.h
+++ b/llvm/include/llvm/ADT/bit.h
@@ -14,7 +14,6 @@
 #ifndef LLVM_ADT_BIT_H
 #define LLVM_ADT_BIT_H
 
-#include "llvm/ADT/bit.h"
 #include "llvm/Support/Compiler.h"
 #include <cstdint>
 #include <limits>
diff --git a/llvm/include/llvm/MC/MCELFExtras.h b/llvm/include/llvm/MC/MCELFExtras.h
index 0f0c10edca2cf..498d477fbedc4 100644
--- a/llvm/include/llvm/MC/MCELFExtras.h
+++ b/llvm/include/llvm/MC/MCELFExtras.h
@@ -10,6 +10,7 @@
 #define LLVM_MC_MCELFEXTRAS_H
 
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/bit.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/Support/LEB128.h"
 #include "llvm/Support/raw_ostream.h"

>From 799485c4797aa0a1dee207988076f628444b9bdd Mon Sep 17 00:00:00 2001
From: Fangrui Song <i at maskray.me>
Date: Fri, 5 Jul 2024 14:51:26 -0700
Subject: [PATCH 2/2] fix FileHeader: !FileHeader

Created using spr 1.3.5-bogner
---
 llvm/test/tools/llvm-objcopy/ELF/crel.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/llvm/test/tools/llvm-objcopy/ELF/crel.test b/llvm/test/tools/llvm-objcopy/ELF/crel.test
index 4c84b45d15559..daf4567d0c8a2 100644
--- a/llvm/test/tools/llvm-objcopy/ELF/crel.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/crel.test
@@ -23,7 +23,7 @@
 # CHECK-NEXT: 0000000000000030  {{.*}}           R_X86_64_64                       0
 
 --- !ELF
-FileHeader: !FileHeader
+FileHeader:
   Class: ELFCLASS64
   Data: ELFDATA2LSB
   Type: ET_REL