ARM: take care not to set the ThumbFunc bit on TLS data symbols

[scott-0]

Summary

MCELF::GetType() returns an enumeration but it was being treated as a bitmask.

This fixes LNT SingleSource/UnitTests/Threads with -mthumb

[compnerd]

Nice find! Thanks for fixing this.

[rengolin]

Hi Scott,

Do you have commit rights?

--renato

[scott-0]

I just got them; thanks.

[scott-0]

Closed by commit rL212029 (authored by @scott-0).

include/llvm/MC/MCELFSymbolFlags.h

ELF_STB_Local     = (ELF::STB_LOCAL     << ELF_STB_Shift),
 
       ELF_STT_Notype    = (ELF::STT_NOTYPE    << ELF_STT_Shift),
       ELF_STT_Object    = (ELF::STT_OBJECT    << ELF_STT_Shift),
       ELF_STT_Func      = (ELF::STT_FUNC      << ELF_STT_Shift),
       ELF_STT_Section   = (ELF::STT_SECTION   << ELF_STT_Shift),
       ELF_STT_File      = (ELF::STT_FILE      << ELF_STT_Shift),
       ELF_STT_Common    = (ELF::STT_COMMON    << ELF_STT_Shift),
       ELF_STT_Tls       = (ELF::STT_TLS       << ELF_STT_Shift),
+      ELF_STT_GnuIFunc  = (ELF::STT_GNU_IFUNC << ELF_STT_Shift),
       ELF_STT_Loproc    = (ELF::STT_LOPROC    << ELF_STT_Shift),
       ELF_STT_Hiproc    = (ELF::STT_HIPROC    << ELF_STT_Shift),
 
       ELF_STV_Default   = (ELF::STV_DEFAULT   << ELF_STV_Shift),
       ELF_STV_Internal  = (ELF::STV_INTERNAL  << ELF_STV_Shift),
       ELF_STV_Hidden    = (ELF::STV_HIDDEN    << ELF_STV_Shift),
       ELF_STV_Protected = (ELF::STV_PROTECTED << ELF_STV_Shift)
   };
 
 } // end namespace llvm
 
 #endif

lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp

 }
 
 void ARMTargetELFStreamer::emitLabel(MCSymbol *Symbol) {
   ARMELFStreamer &Streamer = getStreamer();
   if (!Streamer.IsThumb)
     return;
 
   const MCSymbolData &SD = Streamer.getOrCreateSymbolData(Symbol);
-  if (MCELF::GetType(SD) & (ELF::STT_FUNC << ELF_STT_Shift))
+  unsigned Type = MCELF::GetType(SD);
+  if (Type == ELF_STT_Func || Type == ELF_STT_GnuIFunc)
     Streamer.EmitThumbFunc(Symbol);
 }
 
 void
 ARMTargetELFStreamer::AnnotateTLSDescriptorSequence(const MCSymbolRefExpr *S) {
   getStreamer().EmitFixup(S, FK_Data_4);
 }
 

test/MC/ARM/thumb-types.s

 
 untyped_text_label:
   nop
 
   .type explicit_function,%function
 explicit_function:
   nop
 
+  .long tls(TPOFF)
+
+  .type indirect_function,%gnu_indirect_function
+indirect_function:
+  nop
+
   .data
 
 untyped_data_label:
   nop
 
   .type explicit_data,%object
 explicit_data:
   .long 0
 
+  .section  .tdata,"awT",%progbits
+  .type tls,%object
+  .align  2
+tls:
+  .long 42
+  .size tls, 4
+
+
 @ CHECK: Symbol {
 @ CHECK:   Name: arm_function
 @ CHECK:   Value: 0x6
 @ CHECK:   Type: Function
 @ CHECK: }
 
 @ CHECK: Symbol {
 @ CHECK:   Name: explicit_data

 
 @ CHECK: Symbol {
 @ CHECK:   Name: implicit_function
 @ CHECK:   Value: 0x1
 @ CHECK:   Type: Function
 @ CHECK: }
 
 @ CHECK: Symbol {
+@ CHECK:   Name: indirect_function
+@ CHECK:   Value: 0x13
+@ CHECK:   Type: GNU_IFunc
+@ CHECK: }
+
+@ CHECK: Symbol {
+@ CHECK:   Name: tls
+@ CHECK:   Value: 0x0
+@ CHECK:   Type: TLS
+@ CHECK: }
+
+@ CHECK: Symbol {
 @ CHECK:   Name: untyped_data_label
 @ CHECK:   Value: 0x0
 @ CHECK:   Type: None
 @ CHECK: }
 
 @ CHECK: Symbol {
 @ CHECK:   Name: untyped_text_label
 @ CHECK:   Value: 0xA
 @ CHECK:   Type: None
 @ CHECK: }