diff --git a/llvm/include/llvm/Object/ELFObjectFile.h b/llvm/include/llvm/Object/ELFObjectFile.h --- a/llvm/include/llvm/Object/ELFObjectFile.h +++ b/llvm/include/llvm/Object/ELFObjectFile.h @@ -56,6 +56,7 @@ SubtargetFeatures getMIPSFeatures() const; SubtargetFeatures getARMFeatures() const; SubtargetFeatures getRISCVFeatures() const; + SubtargetFeatures getLoongArchFeatures() const; StringRef getAMDGPUCPUName() const; diff --git a/llvm/lib/Object/ELF.cpp b/llvm/lib/Object/ELF.cpp --- a/llvm/lib/Object/ELF.cpp +++ b/llvm/lib/Object/ELF.cpp @@ -223,6 +223,8 @@ break; case ELF::EM_BPF: break; + case ELF::EM_LOONGARCH: + return ELF::R_LARCH_RELATIVE; default: break; } diff --git a/llvm/lib/Object/ELFObjectFile.cpp b/llvm/lib/Object/ELFObjectFile.cpp --- a/llvm/lib/Object/ELFObjectFile.cpp +++ b/llvm/lib/Object/ELFObjectFile.cpp @@ -342,6 +342,24 @@ return Features; } +SubtargetFeatures ELFObjectFileBase::getLoongArchFeatures() const { + SubtargetFeatures Features; + + switch (getPlatformFlags() & ELF::EF_LOONGARCH_ABI_MODIFIER_MASK) { + case ELF::EF_LOONGARCH_ABI_SOFT_FLOAT: + break; + case ELF::EF_LOONGARCH_ABI_DOUBLE_FLOAT: + Features.AddFeature("d"); + // D implies F according to LoongArch ISA spec. + [[fallthrough]]; + case ELF::EF_LOONGARCH_ABI_SINGLE_FLOAT: + Features.AddFeature("f"); + break; + } + + return Features; +} + SubtargetFeatures ELFObjectFileBase::getFeatures() const { switch (getEMachine()) { case ELF::EM_MIPS: @@ -350,6 +368,8 @@ return getARMFeatures(); case ELF::EM_RISCV: return getRISCVFeatures(); + case ELF::EM_LOONGARCH: + return getLoongArchFeatures(); default: return SubtargetFeatures(); } diff --git a/llvm/test/MC/LoongArch/Basic/Float/d-arith.s b/llvm/test/MC/LoongArch/Basic/Float/d-arith.s --- a/llvm/test/MC/LoongArch/Basic/Float/d-arith.s +++ b/llvm/test/MC/LoongArch/Basic/Float/d-arith.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s ## Support for the 'D' extension implies support for 'F' diff --git a/llvm/test/MC/LoongArch/Basic/Float/d-bound-check.s b/llvm/test/MC/LoongArch/Basic/Float/d-bound-check.s --- a/llvm/test/MC/LoongArch/Basic/Float/d-bound-check.s +++ b/llvm/test/MC/LoongArch/Basic/Float/d-bound-check.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s ## Support for the 'D' extension implies support for 'F' diff --git a/llvm/test/MC/LoongArch/Basic/Float/d-branch.s b/llvm/test/MC/LoongArch/Basic/Float/d-branch.s --- a/llvm/test/MC/LoongArch/Basic/Float/d-branch.s +++ b/llvm/test/MC/LoongArch/Basic/Float/d-branch.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s ## Support for the 'D' extension implies support for 'F' diff --git a/llvm/test/MC/LoongArch/Basic/Float/d-comp.s b/llvm/test/MC/LoongArch/Basic/Float/d-comp.s --- a/llvm/test/MC/LoongArch/Basic/Float/d-comp.s +++ b/llvm/test/MC/LoongArch/Basic/Float/d-comp.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s ## Support for the 'D' extension implies support for 'F' diff --git a/llvm/test/MC/LoongArch/Basic/Float/d-conv.s b/llvm/test/MC/LoongArch/Basic/Float/d-conv.s --- a/llvm/test/MC/LoongArch/Basic/Float/d-conv.s +++ b/llvm/test/MC/LoongArch/Basic/Float/d-conv.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s ## Support for the 'D' extension implies support for 'F' diff --git a/llvm/test/MC/LoongArch/Basic/Float/d-memory.s b/llvm/test/MC/LoongArch/Basic/Float/d-memory.s --- a/llvm/test/MC/LoongArch/Basic/Float/d-memory.s +++ b/llvm/test/MC/LoongArch/Basic/Float/d-memory.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s ## Support for the 'D' extension implies support for 'F' diff --git a/llvm/test/MC/LoongArch/Basic/Float/d-move.s b/llvm/test/MC/LoongArch/Basic/Float/d-move.s --- a/llvm/test/MC/LoongArch/Basic/Float/d-move.s +++ b/llvm/test/MC/LoongArch/Basic/Float/d-move.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --show-encoding --defsym=LA64=1 \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM,ASM-AND-OBJ64,ASM64 %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+d --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+d --filetype=obj --defsym=LA64=1 \ -# RUN: | llvm-objdump -d --mattr=+d - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM-AND-OBJ64 %s ## Support for the 'D' extension implies support for 'F' diff --git a/llvm/test/MC/LoongArch/Basic/Float/f-arith.s b/llvm/test/MC/LoongArch/Basic/Float/f-arith.s --- a/llvm/test/MC/LoongArch/Basic/Float/f-arith.s +++ b/llvm/test/MC/LoongArch/Basic/Float/f-arith.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # ASM-AND-OBJ: fadd.s $fs5, $ft7, $fs1 diff --git a/llvm/test/MC/LoongArch/Basic/Float/f-bound-check.s b/llvm/test/MC/LoongArch/Basic/Float/f-bound-check.s --- a/llvm/test/MC/LoongArch/Basic/Float/f-bound-check.s +++ b/llvm/test/MC/LoongArch/Basic/Float/f-bound-check.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # ASM-AND-OBJ: fldgt.s $fa3, $s4, $t1 diff --git a/llvm/test/MC/LoongArch/Basic/Float/f-branch.s b/llvm/test/MC/LoongArch/Basic/Float/f-branch.s --- a/llvm/test/MC/LoongArch/Basic/Float/f-branch.s +++ b/llvm/test/MC/LoongArch/Basic/Float/f-branch.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # ASM-AND-OBJ: bceqz $fcc6, 12 diff --git a/llvm/test/MC/LoongArch/Basic/Float/f-comp.s b/llvm/test/MC/LoongArch/Basic/Float/f-comp.s --- a/llvm/test/MC/LoongArch/Basic/Float/f-comp.s +++ b/llvm/test/MC/LoongArch/Basic/Float/f-comp.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # ASM-AND-OBJ: fcmp.caf.s $fcc0, $fa0, $fa1 diff --git a/llvm/test/MC/LoongArch/Basic/Float/f-conv.s b/llvm/test/MC/LoongArch/Basic/Float/f-conv.s --- a/llvm/test/MC/LoongArch/Basic/Float/f-conv.s +++ b/llvm/test/MC/LoongArch/Basic/Float/f-conv.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # ASM-AND-OBJ: ffint.s.w $fs6, $fa5 diff --git a/llvm/test/MC/LoongArch/Basic/Float/f-memory.s b/llvm/test/MC/LoongArch/Basic/Float/f-memory.s --- a/llvm/test/MC/LoongArch/Basic/Float/f-memory.s +++ b/llvm/test/MC/LoongArch/Basic/Float/f-memory.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # ASM-AND-OBJ: fld.s $ft15, $t3, 250 diff --git a/llvm/test/MC/LoongArch/Basic/Float/f-move.s b/llvm/test/MC/LoongArch/Basic/Float/f-move.s --- a/llvm/test/MC/LoongArch/Basic/Float/f-move.s +++ b/llvm/test/MC/LoongArch/Basic/Float/f-move.s @@ -3,10 +3,10 @@ # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --show-encoding \ # RUN: | FileCheck --check-prefixes=ASM-AND-OBJ,ASM %s # RUN: llvm-mc %s --triple=loongarch32 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # RUN: llvm-mc %s --triple=loongarch64 --mattr=+f --filetype=obj \ -# RUN: | llvm-objdump -d --mattr=+f - \ +# RUN: | llvm-objdump -d - \ # RUN: | FileCheck --check-prefix=ASM-AND-OBJ %s # ASM-AND-OBJ: fmov.s $ft5, $ft15 diff --git a/llvm/unittests/Object/ELFTest.cpp b/llvm/unittests/Object/ELFTest.cpp --- a/llvm/unittests/Object/ELFTest.cpp +++ b/llvm/unittests/Object/ELFTest.cpp @@ -237,6 +237,7 @@ TEST(ELFTest, getELFRelativeRelocationType) { EXPECT_EQ(ELF::R_VE_RELATIVE, getELFRelativeRelocationType(EM_VE)); + EXPECT_EQ(ELF::R_LARCH_RELATIVE, getELFRelativeRelocationType(EM_LOONGARCH)); } // This is a test for the DataRegion helper struct, defined in ELF.h header.