[LLVMdev] [PATCH][REQUEST] Could someone submit this CSR Kalimba definitions patch please?

[Eric Christopher]

There was a problem with the patch, you forgot to update
Triple::get64BitArchVariant and Triple::get32BitArchVariant and I've
added it as similar to 32-bit chips with no 64-bit variant. If this is
incorrect, please let me know.

Otherwise committed thusly:

M include/llvm/ADT/Triple.h
M lib/Support/Triple.cpp
Committed r212745

Thanks!

-eric

On Thu, Jul 10, 2014 at 12:14 AM, Matthew Gardiner <mg11 at csr.com> wrote:
> Eric Christopher wrote:
>>
>> On Wed, Jul 9, 2014 at 11:39 AM, Jonathan Roelofs
>> <jonathan at codesourcery.com> wrote:
>>>
>>>
>>> On 7/9/14, 12:33 PM, Eric Christopher wrote:
>>>>
>>>> Any reason why you deleted code that isn't related?
>>>>
>>>> -eric
>>>>
>>>>> -  enum SubArchType {
>>>>> -    NoSubArch,
>>>>> -
>>>>> -    ARMSubArch_v8,
>>>>> -    ARMSubArch_v7,
>>>>> -    ARMSubArch_v7em,
>>>>> -    ARMSubArch_v7m,
>>>>> -    ARMSubArch_v7s,
>>>>> -    ARMSubArch_v6,
>>>>> -    ARMSubArch_v6m,
>>>>> -    ARMSubArch_v6t2,
>>>>> -    ARMSubArch_v5,
>>>>> -    ARMSubArch_v5te,
>>>>> -    ARMSubArch_v4t,
>>>>> -    ARMSubArch_v4
>>>>> -  };
>>>
>>>
>>> Eric, looks like a misleading diff... that SubArchType stuff was reverted
>>> recently in trunk.
>>>
>> I recall that patch going across. There's just no reason for it in the
>> diff from Matthew.
>>
>> -eric
>>
>>
>>   To report this email as spam click
>> https://www.mailcontrol.com/sr/MZbqvYs5QwJvpeaetUwhCQ== .
>
> Hi people,
>
> I apologise for the earlier bad diff. Here's one I've just generated against
> the latest svn. The TOT sources build fine with these additions. Is there
> any reason now why this patch cannot be submitted on my behalf? My concern
> is that I cannot submit further work for our chips to lldb until I have
> these definitions in llvm::Triple.
>
> I'll also repost this patch to llvm-commits.
>
> Thanks for your time and patience,
> Matt
>
>  Index: include/llvm/ADT/Triple.h
> ===================================================================
> --- include/llvm/ADT/Triple.h    (revision 212686)
> +++ include/llvm/ADT/Triple.h    (working copy)
> @@ -76,7 +76,8 @@
>
>      le32,       // le32: generic little-endian 32-bit CPU (PNaCl /
> Emscripten)
>      amdil,      // amdil: amd IL
>      spir,       // SPIR: standard portable IR for OpenCL 32-bit version
> -    spir64      // SPIR: standard portable IR for OpenCL 64-bit version
> +    spir64,     // SPIR: standard portable IR for OpenCL 64-bit version
> +    kalimba     // Kalimba: generic kalimba
>    };
>    enum VendorType {
>      UnknownVendor,
> @@ -89,7 +90,8 @@
>      Freescale,
>      IBM,
>      ImaginationTechnologies,
>
> -    NVIDIA
> +    NVIDIA,
> +    CSR
>    };
>    enum OSType {
>      UnknownOS,
> Index: lib/Support/Triple.cpp
> ===================================================================
> --- lib/Support/Triple.cpp    (revision 212686)
>
> +++ lib/Support/Triple.cpp    (working copy)
> @@ -50,6 +50,7 @@
>    case amdil:       return "amdil";
>    case spir:        return "spir";
>    case spir64:      return "spir64";
> +  case kalimba:     return "kalimba";
>    }
>
>    llvm_unreachable("Invalid ArchType!");
> @@ -101,6 +102,7 @@
>    case amdil:       return "amdil";
>    case spir:        return "spir";
>    case spir64:      return "spir";
> +  case kalimba:     return "kalimba";
>    }
>  }
>
> @@ -117,6 +119,7 @@
>    case IBM: return "ibm";
>    case ImaginationTechnologies: return "img";
>
>    case NVIDIA: return "nvidia";
> +  case CSR: return "csr";
>    }
>
>    llvm_unreachable("Invalid VendorType!");
> @@ -208,6 +211,7 @@
>
>      .Case("amdil", amdil)
>      .Case("spir", spir)
>      .Case("spir64", spir64)
> +    .Case("kalimba", kalimba)
>      .Default(UnknownArch);
>  }
>
> @@ -281,6 +285,7 @@
>
>      .Case("amdil", Triple::amdil)
>      .Case("spir", Triple::spir)
>      .Case("spir64", Triple::spir64)
> +    .Case("kalimba", Triple::kalimba)
>      .Default(Triple::UnknownArch);
>  }
>
> @@ -295,6 +300,7 @@
>
>      .Case("ibm", Triple::IBM)
>      .Case("img", Triple::ImaginationTechnologies)
>
>      .Case("nvidia", Triple::NVIDIA)
> +    .Case("csr", Triple::CSR)
>      .Default(Triple::UnknownVendor);
>  }
>
> @@ -800,6 +806,7 @@
>
>    case llvm::Triple::x86:
>    case llvm::Triple::xcore:
>    case llvm::Triple::spir:
> +  case llvm::Triple::kalimba:
>      return 32;
>
>    case llvm::Triple::arm64:
>
>
>
>
> Member of the CSR plc group of companies. CSR plc registered in England and
> Wales, registered number 4187346, registered office Churchill House,
> Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
> More information can be found at www.csr.com. Keep up to date with CSR on
> our technical blog, www.csr.com/blog, CSR people blog, www.csr.com/people,
> YouTube, www.youtube.com/user/CSRplc, Facebook,
> www.facebook.com/pages/CSR/191038434253534, or follow us on Twitter at
> www.twitter.com/CSR_plc.
> New for 2014, you can now access the wide range of products powered by aptX
> at www.aptx.com.