diff options
| -rw-r--r-- | llvm/include/llvm/MC/MCELFSymbolFlags.h | 10 | ||||
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/MC/MCELF.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/MC/ELF/thumb-st_other.s | 19 |
4 files changed, 29 insertions, 9 deletions
diff --git a/llvm/include/llvm/MC/MCELFSymbolFlags.h b/llvm/include/llvm/MC/MCELFSymbolFlags.h index d0e1dace99d..782e7d61267 100644 --- a/llvm/include/llvm/MC/MCELFSymbolFlags.h +++ b/llvm/include/llvm/MC/MCELFSymbolFlags.h @@ -21,10 +21,12 @@ namespace llvm { enum { - ELF_STT_Shift = 0, // Shift value for STT_* flags. - ELF_STB_Shift = 4, // Shift value for STB_* flags. - ELF_STV_Shift = 8, // Shift value for STV_* flags. - ELF_Other_Shift = 10 // Shift value for other flags. + ELF_STT_Shift = 0, // Shift value for STT_* flags. + ELF_STB_Shift = 4, // Shift value for STB_* flags. + ELF_STV_Shift = 8, // Shift value for STV_* flags. + ELF_STO_Shift = 10, // Shift value for STO_* flags. + ELF_Other_Shift = 16 // Shift value for llvm local flags, + // not part of the final object file }; enum ELFSymbolFlags { diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 9899bb2eac2..972c64cc565 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -551,8 +551,7 @@ void ELFObjectWriter::WriteSymbol(MCDataFragment *SymtabF, // Other and Visibility share the same byte with Visibility using the lower // 2 bits uint8_t Visibility = MCELF::GetVisibility(OrigData); - uint8_t Other = MCELF::getOther(OrigData) << - (ELF_Other_Shift - ELF_STV_Shift); + uint8_t Other = MCELF::getOther(OrigData) << (ELF_STO_Shift - ELF_STV_Shift); Other |= Visibility; uint64_t Value = SymbolValue(Data, Layout); diff --git a/llvm/lib/MC/MCELF.cpp b/llvm/lib/MC/MCELF.cpp index ebb189e5439..0a9cd31dda0 100644 --- a/llvm/lib/MC/MCELF.cpp +++ b/llvm/lib/MC/MCELF.cpp @@ -72,13 +72,13 @@ unsigned MCELF::GetVisibility(MCSymbolData &SD) { // Other is stored in the last six bits of st_other // st_other values are stored in the second byte of get/setFlags void MCELF::setOther(MCSymbolData &SD, unsigned Other) { - uint32_t OtherFlags = SD.getFlags() & ~(0x3f << ELF_Other_Shift); - SD.setFlags(OtherFlags | (Other << ELF_Other_Shift)); + uint32_t OtherFlags = SD.getFlags() & ~(0x3f << ELF_STO_Shift); + SD.setFlags(OtherFlags | (Other << ELF_STO_Shift)); } unsigned MCELF::getOther(MCSymbolData &SD) { unsigned Other = - (SD.getFlags() & (0x3f << ELF_Other_Shift)) >> ELF_Other_Shift; + (SD.getFlags() & (0x3f << ELF_STO_Shift)) >> ELF_STO_Shift; return Other; } diff --git a/llvm/test/MC/ELF/thumb-st_other.s b/llvm/test/MC/ELF/thumb-st_other.s new file mode 100644 index 00000000000..8750c2bba5f --- /dev/null +++ b/llvm/test/MC/ELF/thumb-st_other.s @@ -0,0 +1,19 @@ +@ Check the value of st_other for thumb function. + +@ ARM does not define any st_other flags for thumb function. The value +@ for st_other should always be 0. + +@ RUN: llvm-mc < %s -triple thumbv5-linux-gnueabi -filetype=obj -o - \ +@ RUN: | llvm-readobj -t | FileCheck %s + + .syntax unified + .text + .align 2 + .thumb_func + .global main + .type main,%function +main: + bx lr + +@ CHECK: Name: main +@ CHECK: Other: 0 |
