[lld] r223796 - Fix the MSVC build

[Will Newton]

On 9 December 2014 at 17:46, Hans Wennborg <hans at hanshq.net> wrote:
> Author: hans
> Date: Tue Dec  9 11:46:06 2014
> New Revision: 223796
>
> URL: http://llvm.org/viewvc/llvm-project?rev=223796&view=rev
> Log:
> Fix the MSVC build
>
> Modified:
>     lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.h
>     lld/trunk/lib/ReaderWriter/ELF/X86/X86RelocationHandler.h

Thanks, I saw the error but wasn't sure how to fix things up for MSVC.

> Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.h
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.h?rev=223796&r1=223795&r2=223796&view=diff
> ==============================================================================
> --- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.h (original)
> +++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationHandler.h Tue Dec  9 11:46:06 2014
> @@ -21,7 +21,8 @@ template <class ELFT> class AArch64Targe
>  class AArch64TargetRelocationHandler final
>      : public TargetRelocationHandler<AArch64ELFType> {
>  public:
> -  using TargetRelocationHandler<AArch64ELFType>::TargetRelocationHandler;
> +  AArch64TargetRelocationHandler(ELFLinkingContext &targetInfo)
> +      : TargetRelocationHandler<AArch64ELFType>(targetInfo) {}
>
>    std::error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &,
>                                    const lld::AtomLayout &,
>
> Modified: lld/trunk/lib/ReaderWriter/ELF/X86/X86RelocationHandler.h
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86/X86RelocationHandler.h?rev=223796&r1=223795&r2=223796&view=diff
> ==============================================================================
> --- lld/trunk/lib/ReaderWriter/ELF/X86/X86RelocationHandler.h (original)
> +++ lld/trunk/lib/ReaderWriter/ELF/X86/X86RelocationHandler.h Tue Dec  9 11:46:06 2014
> @@ -20,7 +20,8 @@ typedef llvm::object::ELFType<llvm::supp
>  class X86TargetRelocationHandler final
>      : public TargetRelocationHandler<X86ELFType> {
>  public:
> -  using TargetRelocationHandler<X86ELFType>::TargetRelocationHandler;
> +  X86TargetRelocationHandler(ELFLinkingContext &targetInfo)
> +      : TargetRelocationHandler<X86ELFType>(targetInfo) {}
>
>    std::error_code applyRelocation(ELFWriter &, llvm::FileOutputBuffer &,
>                                    const lld::AtomLayout &,
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



-- 
Will Newton
Toolchain Working Group, Linaro