Hi Evan,
I'm getting:
llvm[4]: Compiling BackendUtil.cpp for Release+Asserts build
/home/jay/svn/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp: In member func
tion ‘bool<unnamed>::EmitAssemblyHelper::AddEmitPasses(clang::BackendAction, llv
m::formatted_raw_ostream&)’:
/home/jay/svn/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp:241:5:
error: ‘setCodeModel’ is not a member of ‘llvm::TargetMachine’
/home/jay/svn/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp:243:5:
error: ‘setCodeModel’ is not a member of ‘llvm::TargetMachine’
/home/jay/svn/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp:245:5:
error: ‘setCodeModel’ is not a member of ‘llvm::TargetMachine’
/home/jay/svn/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp:247:5:
error: ‘setCodeModel’ is not a member of ‘llvm::TargetMachine’
/home/jay/svn/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp:250:5:
error: ‘setCodeModel’ is not a member of ‘llvm::TargetMachine’
/bin/rm: cannot remove
`/home/jay/llvm/objdir/tools/clang/lib/CodeGen/Release+Asserts/BackendUtil.d.tmp':
No such file or directory
make[4]: *** [/home/jay/llvm/objdir/tools/clang/lib/CodeGen/Release+Asserts/BackendUtil.o]
Error 1
This is from a Release+Asserts build of LLVM and Clang, both at
r135581, on Ubuntu Natty x86_64.
Thanks,
Jay.
On 19 July 2011 07:37, Evan Cheng <evan.cheng at apple.com> wrote:
> Author: evancheng
> Date: Tue Jul 19 01:37:41 2011
> New Revision: 135469
>
> URL: http://llvm.org/viewvc/llvm-project?rev=135469&view=rev
> Log:
> Match createTargetMachine API change.
>
> Modified:
> cfe/trunk/lib/CodeGen/BackendUtil.cpp
> cfe/trunk/tools/driver/cc1_main.cpp
> cfe/trunk/tools/driver/cc1as_main.cpp
>
> Modified: cfe/trunk/lib/CodeGen/BackendUtil.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp?rev=135469&r1=135468&r2=135469&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/BackendUtil.cpp (original)
> +++ cfe/trunk/lib/CodeGen/BackendUtil.cpp Tue Jul 19 01:37:41 2011
> @@ -237,16 +237,6 @@
> TargetMachine::setDataSections (CodeGenOpts.DataSections);
>
> // FIXME: Parse this earlier.
> - if (CodeGenOpts.RelocationModel == "static") {
> - TargetMachine::setRelocationModel(llvm::Reloc::Static);
> - } else if (CodeGenOpts.RelocationModel == "pic") {
> - TargetMachine::setRelocationModel(llvm::Reloc::PIC_);
> - } else {
> - assert(CodeGenOpts.RelocationModel == "dynamic-no-pic" &&
> - "Invalid PIC model!");
> - TargetMachine::setRelocationModel(llvm::Reloc::DynamicNoPIC);
> - }
> - // FIXME: Parse this earlier.
> if (CodeGenOpts.CodeModel == "small") {
> TargetMachine::setCodeModel(llvm::CodeModel::Small);
> } else if (CodeGenOpts.CodeModel == "kernel") {
> @@ -287,8 +277,20 @@
> Features.AddFeature(*it);
> FeaturesStr = Features.getString();
> }
> +
> + llvm::Reloc::Model RM = llvm::Reloc::Default;
> + if (CodeGenOpts.RelocationModel == "static") {
> + RM = llvm::Reloc::Static;
> + } else if (CodeGenOpts.RelocationModel == "pic") {
> + RM = llvm::Reloc::PIC_;
> + } else {
> + assert(CodeGenOpts.RelocationModel == "dynamic-no-pic" &&
> + "Invalid PIC model!");
> + RM = llvm::Reloc::DynamicNoPIC;
> + }
> +
> TargetMachine *TM = TheTarget->createTargetMachine(Triple, TargetOpts.CPU,
> - FeaturesStr);
> + FeaturesStr, RM);
>
> if (CodeGenOpts.RelaxAll)
> TM->setMCRelaxAll(true);
>
> Modified: cfe/trunk/tools/driver/cc1_main.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1_main.cpp?rev=135469&r1=135468&r2=135469&view=diff
> ==============================================================================
> --- cfe/trunk/tools/driver/cc1_main.cpp (original)
> +++ cfe/trunk/tools/driver/cc1_main.cpp Tue Jul 19 01:37:41 2011
> @@ -127,6 +127,7 @@
> // Initialize targets first, so that --version shows registered targets.
> llvm::InitializeAllTargets();
> llvm::InitializeAllMCAsmInfos();
> + llvm::InitializeAllMCCodeGenInfos();
> llvm::InitializeAllMCSubtargetInfos();
> llvm::InitializeAllAsmPrinters();
> llvm::InitializeAllAsmParsers();
>
> Modified: cfe/trunk/tools/driver/cc1as_main.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/cc1as_main.cpp?rev=135469&r1=135468&r2=135469&view=diff
> ==============================================================================
> --- cfe/trunk/tools/driver/cc1as_main.cpp (original)
> +++ cfe/trunk/tools/driver/cc1as_main.cpp Tue Jul 19 01:37:41 2011
> @@ -361,6 +361,7 @@
> // FIXME: We shouldn't need to initialize the Target(Machine)s.
> InitializeAllTargets();
> InitializeAllMCAsmInfos();
> + InitializeAllMCCodeGenInfos();
> InitializeAllMCInstrInfos();
> InitializeAllMCRegisterInfos();
> InitializeAllMCSubtargetInfos();
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>