[llvm] r270017 - [WebAssembly] Update WebAssembly target for r269988.

[Rafael Espíndola via llvm-commits]

Oops. Sorry about that. Should we move it out of experimental?

Cheers,
Rafael
On May 18, 2016 11:06 PM, "Dan Gohman via llvm-commits" <
llvm-commits at lists.llvm.org> wrote:

> Author: djg
> Date: Wed May 18 22:00:05 2016
> New Revision: 270017
>
> URL: http://llvm.org/viewvc/llvm-project?rev=270017&view=rev
> Log:
> [WebAssembly] Update WebAssembly target for r269988.
>
> Modified:
>     llvm/trunk/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp
>     llvm/trunk/lib/Target/WebAssembly/WebAssemblyTargetMachine.h
>
> Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp?rev=270017&r1=270016&r2=270017&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp
> (original)
> +++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp Wed May
> 18 22:00:05 2016
> @@ -39,16 +39,23 @@ extern "C" void LLVMInitializeWebAssembl
>  // WebAssembly Lowering public interface.
>
>  //===----------------------------------------------------------------------===//
>
> +static Reloc::Model getEffectiveRelocModel(Optional<Reloc::Model> RM) {
> +  if (!RM.hasValue())
> +    return Reloc::PIC_;
> +  return *RM;
> +}
> +
>  /// Create an WebAssembly architecture model.
>  ///
>  WebAssemblyTargetMachine::WebAssemblyTargetMachine(
>      const Target &T, const Triple &TT, StringRef CPU, StringRef FS,
> -    const TargetOptions &Options, Reloc::Model RM, CodeModel::Model CM,
> -    CodeGenOpt::Level OL)
> +    const TargetOptions &Options, Optional<Reloc::Model> RM,
> +    CodeModel::Model CM, CodeGenOpt::Level OL)
>      : LLVMTargetMachine(T,
>                          TT.isArch64Bit() ?
> "e-m:e-p:64:64-i64:64-n32:64-S128"
>                                           :
> "e-m:e-p:32:32-i64:64-n32:64-S128",
> -                        TT, CPU, FS, Options, RM, CM, OL),
> +                        TT, CPU, FS, Options, getEffectiveRelocModel(RM),
> +                        CM, OL),
>        TLOF(make_unique<WebAssemblyTargetObjectFile>()) {
>    // WebAssembly type-checks expressions, but a noreturn function with a
> return
>    // type that doesn't match the context will cause a check failure. So
> we lower
>
> Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyTargetMachine.h
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyTargetMachine.h?rev=270017&r1=270016&r2=270017&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/WebAssembly/WebAssemblyTargetMachine.h (original)
> +++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyTargetMachine.h Wed May
> 18 22:00:05 2016
> @@ -28,7 +28,7 @@ class WebAssemblyTargetMachine final : p
>  public:
>    WebAssemblyTargetMachine(const Target &T, const Triple &TT, StringRef
> CPU,
>                             StringRef FS, const TargetOptions &Options,
> -                           Reloc::Model RM, CodeModel::Model CM,
> +                           Optional<Reloc::Model> RM, CodeModel::Model CM,
>                             CodeGenOpt::Level OL);
>
>    ~WebAssemblyTargetMachine() override;
>
>
> _______________________________________________
> 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/20160519/7dfa0b93/attachment.html>