[llvm-commits] [llvm] r130637 - in /llvm/trunk: include/llvm/CodeGen/TargetLoweringObjectFileImpl.h include/llvm/MC/MCDwarf.h include/llvm/Target/TargetAsmInfo.h include/llvm/Target/TargetLoweringObjectFile.h lib/CodeGen/AsmPrinter/DwarfTableExce

[Chandler Carruth]

On Sat, Apr 30, 2011 at 9:49 PM, Rafael Espindola <
rafael.espindola at gmail.com> wrote:

> Modified: llvm/trunk/lib/Target/X86/X86TargetObjectFile.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetObjectFile.cpp?rev=130637&r1=130636&r2=130637&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Target/X86/X86TargetObjectFile.cpp (original)
> +++ llvm/trunk/lib/Target/X86/X86TargetObjectFile.cpp Sat Apr 30 23:49:54
> 2011
> @@ -58,7 +58,7 @@
>     return DW_EH_PE_absptr;
>  }
>
> -unsigned X8632_ELFTargetObjectFile::getFDEEncoding() const {
> +unsigned X8632_ELFTargetObjectFile::getFDEEncoding(bool FDE) const {
>   if (TM.getRelocationModel() == Reloc::PIC_)
>     return DW_EH_PE_pcrel | DW_EH_PE_sdata4;
>   else
> @@ -97,8 +97,15 @@
>   return DW_EH_PE_absptr;
>  }
>
> -unsigned X8664_ELFTargetObjectFile::getFDEEncoding() const {
> -  return DW_EH_PE_pcrel | DW_EH_PE_sdata4;
> +unsigned X8664_ELFTargetObjectFile::getFDEEncoding(bool CFI) const {
> +  if (CFI)
> +    return DW_EH_PE_pcrel | DW_EH_PE_sdata4;
> +
> +  CodeModel::Model Model = TM.getCodeModel();
>

FYI, I removed this variable in r130640 as it was unused and causing
warnings. Mentioning it on the off chance it was intended to be used...


> +  if (TM.getRelocationModel() == Reloc::PIC_)
> +    return DW_EH_PE_pcrel | DW_EH_PE_sdata4;
> +
> +  return DW_EH_PE_udata4;
>  }
>
>  unsigned X8664_ELFTargetObjectFile::getTTypeEncoding() const {
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20110430/ac154c2e/attachment.html>