diff --git a/llvm/include/llvm/ExecutionEngine/JITLink/aarch32.h b/llvm/include/llvm/ExecutionEngine/JITLink/aarch32.h index 51413a46dc413..f346cfb2a9311 100644 --- a/llvm/include/llvm/ExecutionEngine/JITLink/aarch32.h +++ b/llvm/include/llvm/ExecutionEngine/JITLink/aarch32.h @@ -195,12 +195,10 @@ struct FixupInfoThumb : public FixupInfoBase { /// template struct FixupInfo {}; -namespace { struct FixupInfoArmBranch : public FixupInfoArm { static constexpr uint32_t Opcode = 0x0a000000; static constexpr uint32_t ImmMask = 0x00ffffff; }; -} // namespace template <> struct FixupInfo : public FixupInfoArmBranch { static constexpr uint32_t OpcodeMask = 0x0f000000; @@ -214,13 +212,11 @@ template <> struct FixupInfo : public FixupInfoArmBranch { static constexpr uint32_t BitBlx = 0x10000000; }; -namespace { struct FixupInfoArmMov : public FixupInfoArm { static constexpr uint32_t OpcodeMask = 0x0ff00000; static constexpr uint32_t ImmMask = 0x000f0fff; static constexpr uint32_t RegMask = 0x0000f000; }; -} // namespace template <> struct FixupInfo : public FixupInfoArmMov { static constexpr uint32_t Opcode = 0x03400000; @@ -244,13 +240,11 @@ template <> struct FixupInfo : public FixupInfoThumb { static constexpr uint16_t LoBitNoBlx = 0x1000; }; -namespace { struct FixupInfoThumbMov : public FixupInfoThumb { static constexpr HalfWords OpcodeMask{0xfbf0, 0x8000}; static constexpr HalfWords ImmMask{0x040f, 0x70ff}; static constexpr HalfWords RegMask{0x0000, 0x0f00}; }; -} // namespace template <> struct FixupInfo : public FixupInfoThumbMov { static constexpr HalfWords Opcode{0xf2c0, 0x0000};