[lld] r274107 - [LTO] Infer ELFKind/EMachine from Bitcode files

[Sean Silva via llvm-commits]

On Tue, Jun 28, 2016 at 11:12 PM, Davide Italiano via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

> Author: davide
> Date: Wed Jun 29 01:12:39 2016
> New Revision: 274107
>
> URL: http://llvm.org/viewvc/llvm-project?rev=274107&view=rev
> Log:
> [LTO] Infer ELFKind/EMachine from Bitcode files
>
> So that users are not forced to pass `-m` on the command line
> when the inputs are all bitcode.
>
> PR:   28268
> Differential Revision:  http://reviews.llvm.org/D21779
>
> Modified:
>     lld/trunk/ELF/InputFiles.cpp
>     lld/trunk/test/ELF/lto/pic.ll
>
> Modified: lld/trunk/ELF/InputFiles.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=274107&r1=274106&r2=274107&view=diff
>
> ==============================================================================
> --- lld/trunk/ELF/InputFiles.cpp (original)
> +++ lld/trunk/ELF/InputFiles.cpp Wed Jun 29 01:12:39 2016
> @@ -14,6 +14,7 @@
>  #include "SymbolTable.h"
>  #include "Symbols.h"
>  #include "llvm/ADT/STLExtras.h"
> +#include "llvm/Bitcode/ReaderWriter.h"
>  #include "llvm/CodeGen/Analysis.h"
>  #include "llvm/IR/LLVMContext.h"
>  #include "llvm/IR/Module.h"
> @@ -552,7 +553,45 @@ template <class ELFT> void SharedFile<EL
>    }
>  }
>
> -BitcodeFile::BitcodeFile(MemoryBufferRef M) : InputFile(BitcodeKind, M) {}
> +static ELFKind getELFKind(MemoryBufferRef MB) {
> +  std::string TripleStr = getBitcodeTargetTriple(MB, Driver->Context);
> +  Triple TheTriple(TripleStr);
> +  bool Is64Bits = TheTriple.isArch64Bit();
> +  if (TheTriple.isLittleEndian())
> +    return Is64Bits ? ELF64LEKind : ELF32LEKind;
> +  return Is64Bits ? ELF64BEKind : ELF32BEKind;
> +}
> +
> +static uint8_t getMachineKind(MemoryBufferRef MB) {
> +  std::string TripleStr = getBitcodeTargetTriple(MB, Driver->Context);
> +  switch (Triple(TripleStr).getArch()) {
> +    case Triple::aarch64:
> +      return EM_AARCH64;
> +    case Triple::arm:
> +      return EM_ARM;
> +    case Triple::mips:
> +    case Triple::mipsel:
> +    case Triple::mips64:
> +    case Triple::mips64el:
> +      return EM_MIPS;
> +    case Triple::ppc:
> +      return EM_PPC;
> +    case Triple::ppc64:
> +      return EM_PPC64;
> +    case Triple::x86:
> +      return EM_386;
> +    case Triple::x86_64:
> +      return EM_X86_64;
> +    default:
> +      fatal("unsupported architecture: " + TripleStr);
>

Can this message be refined? Maybe something like "could not infer
e_machine from bitcode target triple '<thetriple>'"?

-- Sean Silva


> +  }
> +}
> +
> +BitcodeFile::BitcodeFile(MemoryBufferRef MB) :
> +    InputFile(BitcodeKind, MB) {
> +  EKind = getELFKind(MB);
> +  EMachine = getMachineKind(MB);
> +}
>
>  static uint8_t getGvVisibility(const GlobalValue *GV) {
>    switch (GV->getVisibility()) {
>
> Modified: lld/trunk/test/ELF/lto/pic.ll
> URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/pic.ll?rev=274107&r1=274106&r2=274107&view=diff
>
> ==============================================================================
> --- lld/trunk/test/ELF/lto/pic.ll (original)
> +++ lld/trunk/test/ELF/lto/pic.ll Wed Jun 29 01:12:39 2016
> @@ -1,7 +1,7 @@
>  ; REQUIRES: x86
>
>  ; RUN: llvm-as %s -o %t.o
> -; RUN: ld.lld %t.o -m elf_x86_64 -o %t.so -shared
> +; RUN: ld.lld %t.o -o %t.so -shared
>  ; RUN: llvm-readobj -r %t.so | FileCheck %s
>
>  ; CHECK:      Relocations [
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160629/073011ea/attachment.html>