Subzero: Run sandboxed cross tests, and do some cleanup.

src/IceELFObjectWriter.cpp

 //===- subzero/src/IceELFObjectWriter.cpp - ELF object file writer --------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines the writer for ELF relocatable object files.
@@ skipping 18 matching lines @@
 namespace {
 
 struct {
   bool IsELF64;
   uint16_t ELFMachine;
   uint32_t ELFFlags;
 } ELFTargetInfo[] = {
 #define X(tag, str, is_elf64, e_machine, e_flags)                              \
   { is_elf64, e_machine, e_flags }                                             \
   ,
-      TARGETARCH_TABLE
+    TARGETARCH_TABLE
 #undef X
 };
 
 bool isELF64(TargetArch Arch) {
   if (Arch < TargetArch_NUM)
     return ELFTargetInfo[Arch].IsELF64;
   llvm_unreachable("Invalid target arch for isELF64");
   return false;
 }
 
@@ skipping 187 matching lines @@
     Section = TextSections[0];
     RelSection = RelTextSections[0];
   }
   RelocOffsetT OffsetInSection = Section->getCurrentSize();
   // Function symbols are set to 0 size in the symbol table,
   // in contrast to data symbols which have a proper size.
   SizeT SymbolSize = 0;
   Section->appendData(Str, Asm->getBufferView());
   uint8_t SymbolType;
   uint8_t SymbolBinding;
-  if (IsInternal) {
+  if (IsInternal && !Ctx.getFlags().getDisableInternal()) {
     SymbolType = STT_NOTYPE;
     SymbolBinding = STB_LOCAL;
   } else {
     SymbolType = STT_FUNC;
     SymbolBinding = STB_GLOBAL;
   }
   SymTab->createDefinedSym(FuncName, SymbolType, SymbolBinding, Section,
                            OffsetInSection, SymbolSize);
   StrTab->add(FuncName);
 
@@ skipping 280 matching lines @@
 void ELFObjectWriter::writeAllRelocationSections(bool IsELF64) {
   writeRelocationSections(IsELF64, RelTextSections);
   writeRelocationSections(IsELF64, RelDataSections);
   writeRelocationSections(IsELF64, RelRODataSections);
 }
 
 void ELFObjectWriter::setUndefinedSyms(const ConstantList &UndefSyms) {
   for (const Constant *S : UndefSyms) {
     const auto Sym = llvm::cast<ConstantRelocatable>(S);
     const IceString &Name = Sym->getName();
+    bool BadIntrinsic;
+    const Intrinsics::FullIntrinsicInfo *Info =
+        Ctx.getIntrinsicsInfo().find(Name, BadIntrinsic);
+    if (Info)

[jvoung (off chromium), 2015/03/03 22:58:01]

oops didn't think an intrinsic name would make it this far down, but I guess
it's added to the extern syms list early?

[Jim Stichnoth, 2015/03/03 23:18:51]

Yeah, these llvm.* symbols were making it into the ELF file and causing
undefined symbol errors during the link.  I'm not sure why it wasn't happening
for the spec2k builds - maybe it was something about the gold arguments?  In any
case, it seemed like keeping them out of the ELF file was the right thing to do.

This definitely happens for the IceConverter, but I'm not sure whether the
PNaClTranslator does it as well.  Regardless, it seemed more appropriate to
continue dealing with intrinsic issues during lowering and afterwards.

[jvoung (off chromium), 2015/03/03 23:52:52]

Okay, I agree it shouldn't be in the undefined symbols list, so it's not really
gold's problem.
I thought it would be better that earlier layers like
IceConverter/PNaClTranslator or the target lowering to "fully" deal with
intrinsics and not expose intrinsics to this layer. For example, at this layer
it should have "setjmp" but not "llvm.setjmp". Otherwise, this is fine for now
to get testing going.

+      continue;
+    assert(!BadIntrinsic);
     assert(Sym->getOffset() == 0);
     assert(Sym->getSuppressMangling());
     SymTab->noteUndefinedSym(Name, NullSection);
     StrTab->add(Name);
   }
 }
 
 void ELFObjectWriter::writeRelocationSections(bool IsELF64,
                                               RelSectionList &RelSections) {
   for (ELFRelocationSection *RelSec : RelSections) {
@@ skipping 53 matching lines @@
   if (IsELF64) {
     writeELFHeaderInternal<true>(ShOffset, ShStrTab->getNumber(),
                                  AllSections.size());
   } else {
     writeELFHeaderInternal<false>(ShOffset, ShStrTab->getNumber(),
                                   AllSections.size());
   }
 }
 
 } // end of namespace Ice