[1/2] arm-toolchain/armcompiler: upgrade to 6.17

Message ID 20220106110101.643678-1-ross.burton@arm.com
State New
Headers show
Series [1/2] arm-toolchain/armcompiler: upgrade to 6.17 | expand

Commit Message

Ross Burton Jan. 6, 2022, 11:01 a.m. UTC
Upgrade to the latest release, now based on Clang 14.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../Armcompiler-License-agreement             | 201 +++++++++---------
 .../Armcompiler-Redistributables              |  26 +--
 .../Armcompiler-Supplementary-terms           |   4 +-
 .../Armcompiler-Third-party-licenses          |  98 +++------
 ...rmcompiler_6.16.bb => armcompiler_6.17.bb} |  10 +-
 5 files changed, 156 insertions(+), 183 deletions(-)
 rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{armcompiler_6.16.bb => armcompiler_6.17.bb} (89%)

Comments

Jon Mason Jan. 6, 2022, 3:55 p.m. UTC | #1
On Thu, 6 Jan 2022 11:01:00 +0000, Ross Burton wrote:
> Upgrade to the latest release, now based on Clang 14.

Applied, thanks!

[1/2] arm-toolchain/armcompiler: upgrade to 6.17
      commit: 07c7d2f9486091627675627f8559d4162ae752ba
[2/2] arm-toolchain: remove armcompiler-specific licenses
      commit: 22b453f785e7803ffe9b4be23f8f27f39f8a220b

Best regards,

Patch

diff --git a/meta-arm-toolchain/custom-licenses/Armcompiler-License-agreement b/meta-arm-toolchain/custom-licenses/Armcompiler-License-agreement
index 9861f00c..99bac868 100644
--- a/meta-arm-toolchain/custom-licenses/Armcompiler-License-agreement
+++ b/meta-arm-toolchain/custom-licenses/Armcompiler-License-agreement
@@ -1,165 +1,174 @@ 
-END USER LICENSE AGREEMENT FOR ARM SOFTWARE DEVELOPMENT TOOLS
+                END USER LICENSE AGREEMENT FOR ARM SOFTWARE DEVELOPMENT TOOLS
 
 This end user license agreement ("License") is a legal agreement between you (a single individual), or the company or organisation (a single legal entity) that you represent and have the legal authority to bind, and Arm relating to use of the Arm Tools. Arm is only willing to license the Arm Tools on condition that you accept all of the terms of this License. By clicking "I Agree" or by installing or otherwise using the Arm Tools and/or any Update thereto (as permitted by this License) you indicate that you agree to be bound by all of the terms and conditions of this License. If you do not agree to the terms of this License, Arm will NOT license the Arm Tools to you, you may not install or use the Arm Tools or any part thereof, and you shall promptly return the Arm Tools to Arm or to your supplier (if not Arm) and ask for a refund of the license fee paid (if any).
 
 NOTE - YOUR ATTENTION IS DRAWN TO THE FOLLOWING:
 
-(A) The terms and conditions set out in this License shall apply to the supply by Arm of Arm Tools for both commercial and non-commercial use. If you are in receipt of a Non-Commercial Use License for the Arm Tools (each capitalised term as defined below), or the Arm Tools or any component thereof are identified or classified as such, or you are receiving a license for the Arm Tools free of charge, then notwithstanding any of the other terms and conditions of this License, your use of the Arm Tools shall be limited by the restrictions of use set out in clause 2.2 of this License.
+(A)     The terms and conditions set out in this License shall apply to the supply by Arm of Arm Tools for both commercial and non-commercial use. If you are in receipt of a Non-Commercial Use License for the Arm Tools (each capitalised term as defined below), or the Arm Tools or any component thereof are identified or classified as such, or you are receiving a license for the Arm Tools free of charge, then notwithstanding any of the other terms and conditions of this License, your use of the Arm Tools shall be limited by the restrictions of use set out in clause 3 of this License.
 
-(B) PLEASE NOTE any terms and conditions of use set out in the order documentation provided to you by Arm and the Software Information File(s) (as defined below) applicable to the Arm Tools provided to you with (or included within) either (i) the Arm Tools, and/or (ii) any Updates to the Arm Tools, which limit, extend or otherwise vary the permitted uses and restrictions applicable to the Arm Tools ("Special Conditions"). The Special Conditions form part of and are incorporated into this License. In the event of any conflict or inconsistency between the provisions set out in the main body of this License and any of the Special Conditions, the provisions set out in the Special Conditions shall prevail (in the order in which they are listed in this paragraph).
+(B)     PLEASE NOTE any terms and conditions of use set out in the order documentation provided to you by Arm and the Software Information File(s) (as defined below) applicable to the Arm Tools provided to you with (or included within) either (i) the Arm Tools, and/or (ii) any Updates to the Arm Tools, which limit, extend or otherwise vary the permitted uses and restrictions applicable to the Arm Tools ("Special Conditions"). The Special Conditions form part of and are incorporated into this License. In the event of any conflict or inconsistency between the provisions set out in the main body of this License and any of the Special Conditions, the provisions set out in the Special Conditions shall prevail (in the order in which they are listed in this paragraph).
 
-(C) This License (and any documents incorporated by reference herein) is the sole and exclusive agreement between you and Arm for the Arm Tools, and (except as agreed in writing to the contrary) no other document, including (but not limited to) your purchase order or any other document supplied by you, will form part of this License.
+(C)     This License (and any documents incorporated by reference herein) is the sole and exclusive agreement between you and Arm for the Arm Tools, and (except as agreed in writing to the contrary) no other document, including (but not limited to) your purchase order or any other document supplied by you, will form part of this License.
 
-DEFINITIONS
+1. DEFINITIONS
 For the purposes of this License the following words and expressions shall have the following meanings:
 "Arm" means Arm Limited whose registered office is situated at 110 Fulbourn Road, Cambridge CB1 9NJ, England and/or any member of Arm's group of companies.
-"Arm Documentation" means any printed, electronic or online documentation relating to Arm Software licensed to you by Arm under this License.
-"Arm Software" means any and all software, firmware and data licensed to you by Arm under this License.
-"Arm Tools" means any and all Arm Software and/or Arm Documentation owned or licensed by Arm, and any Updates to the Arm Software and/or Arm Documentation.
-"Arm Tools Performance Data" means any results, benchmarking data or other information relating to or connected with your use or testing of the Arm Tools which are indicative of their performance, efficacy, reliability or quality.
+"Arm Documentation" means any printed, electronic or online documentation owned or licensed by Arm that relates to the Arm Software.
+"Arm Software" means any software, firmware and data owned or licensed by Arm.
+"Arm Tools" means the Arm Software and/or Arm Documentation (including any Updates to the Arm Software and/or Arm Documentation) licensed to you by Arm under this License.
+"Arm Tools Performance Data" means any results, benchmarking data or other information relating to or connected with your use or testing of Arm Tools which is indicative of their performance, efficacy, reliability or quality.
 "Fees" means any fee(s) payable by you for the provision by Arm to you of the Arm Tools and associated support and maintenance services, and any other fees payable by you in accordance with this License that are agreed by the parties from time to time.
 "License Key" means an electronic license key issued to you by Arm which enables you to use and run one or more Licensed Seat of an Arm Tool or a component thereof in accordance with the terms of this License.
-"Licensed Seats" means any and all Seats of the Arm Tools (including, if applicable, Updates) that you are licensed to run and use concurrently under the terms of this License, in the types and quantities specified in the order documentation provided to you by Arm, as well as any additional or replacement Seats of the Arm Tools that Arm agrees to provide to you from time to time during the License Term.
+"Licensed Seats" means any and all Seats of the Arm Tools (including, if applicable, Updates) that you are licensed to run and use concurrently under the terms of this License, in the types and quantities specified (if applicable) in the order documentation provided to you by Arm, as well as any additional or replacement Seats of the Arm Tools that Arm provides to you from time to time during the License Term (For the purposes of this definition, "Seat" meaning a written or electronic authorisation to run a software component subject to the terms and restrictions specified in that authorisation).
 "License Term" means the term set out in the order documentation provided to you by Arm during which you shall be entitled to access and use the Arm Tools.
 "Non-Commercial Use License" means an evaluation, preview, beta, pre-release, pilot, academic, educational or community use only license.
 "Permitted Users" means your employees, workers, consultants, professional advisors, bona fide sub-contractors and service providers that use the Arm Tools in connection with the provision of work carried out for your benefit, and/or, other members of your organisation or third party users who use the Arm Tools with your express written permission on computers (physical or virtual) owned or controlled by you.
-"Redistributables" means the example code, library files, configuration files, header files, and any other Arm Tools or components thereof owned by Arm (or licensed by Arm and provided to you under Arm's terms and conditions) which you are permitted to include within Your Software and redistribute or sub-license within Your Software to third parties, the details of which (if applicable) are set out in a file or folder (the "Redistributables File") typically named 'redistributables' located within an Arm Tool (or components thereof).
-"Seat" means a written or electronic authorisation to run a software component subject to the terms and restrictions specified in that authorisation.
+"Redistributables" means the example code, library files, configuration files, header files, and any other Arm Tools or components thereof owned by Arm (or licensed by Arm and provided to you under Arm's terms and conditions) which you are permitted to include within Your Software and redistribute or sub-license within Your Software to third parties, the details of which (if applicable) are set out in a file or folder (the "Redistributables File") typically named 'redistributables' located within the 'license_terms' folder in an Arm Tool (or components thereof).
 "Software Information File(s)" means Third Party Licenses Files, Redistributables Files, and/or Supplementary Terms Files (as the context requires).
 "Special Conditions" is as defined above in Recital (B) of this License.
-"Specified Project" means a single design and development activity undertaken by you or your Permitted Users relating to Your Software or Your Hardware, the details of which will be set out in the order documentation provided to you by Arm.
-"Supplementary Terms File" means a software file or folder typically named 'supplementary_terms' located within an Arm Tool (or components thereof) which (if applicable) details any component-specific extensions, limitations or other variations to the terms of this License.
+"Specified Project" means a single design and development activity undertaken by you or your Permitted Users relating to Your Software or Your Hardware, the details of which (if applicable) shall be set out in the order documentation provided to you by Arm.
+"Supplementary Terms File" means a software file or folder typically named 'supplementary_terms' located within the 'license_terms' folder in an Arm Tool (or components thereof) which (if applicable) details any component-specific extensions, limitations or other variations to the terms of this License.
 "Territory" means, if applicable, the geographical area detailed in the order documentation provided to you by Arm to which your use of the Arm Tools or any part thereof is restricted.
-"Third Party Licenses File" means a software file or folder typically named 'third_party_licenses' located within an Arm Tool (or components thereof) which (if applicable) details any third party material included in the relevant Arm Tool which is not licensed under the terms of this License, and a reference to the applicable third party license terms and conditions.
+"Third Party Licenses File" means a software file or folder typically named 'third_party_licenses' located within the 'license_terms' folder in an Arm Tool (or components thereof) which (if applicable) details any third party material included in the relevant Arm Tool which is not licensed under the terms of this License, and references the applicable third party license terms and conditions.
 "Update" means an update, patch, hotfix, bug fix, support release, modification or limited functional enhancement (as applicable) to an Arm Tool or component thereof, including but not limited to error corrections to any program or associated documentation developed by or for Arm comprised in the Arm Tools, which (i) Arm makes generally available to the market, and (ii) does not, in Arm's opinion, constitute an Upgrade or a new product.
 "Upgrade" means a new release of an existing Arm Tool which Arm makes generally available to the market and which usually contains major functional improvements.
 "Your Hardware" means hardware manufactured or developed by you or on your behalf, or hardware owned or licensed by you, which is supported by the Arm Tools.
-"Your Reports" means any written reports or other information relating to the behavior or performance of Your Software or Your Hardware, in html, binary, text or any other format (excluding for the avoidance of doubt, Arm Tools Performance Data), generated by you from or using the Arm Tools and any modifications thereto.
-"Your Software" means any software owned or licensed by you (including, but not limited to, applications, libraries and Arm API compliant plug-ins, but excluding Arm Software) which is supported by (or developed by you using) the Arm Tools.
+"Your Reports" means any written reports or other information relating to the behavior, performance or configuration of Your Software or Your Hardware, in html, binary, text or any other format (excluding for the avoidance of doubt, Arm Tools Performance Data), generated by you from or using Arm Tools and any modifications thereto.
+"Your Software" means any software owned or licensed by you (including, but not limited to, applications, libraries and Arm API compliant plug-ins, but excluding Arm Software) which is supported by (or developed by you using) Arm Tools.
 
-1. LICENSE GRANT
-1.1 Subject to your compliance with the terms and conditions of this License, and payment by you of the Fees (if any), Arm hereby grants to you and your Permitted Users during the License Term a non-exclusive, non-transferable license to receive and use the Arm Tools, certain components thereof, or optional functionality, in the Territory only on the Licensed Seats or for a Specified Project (as applicable) for the permitted uses set out in this clause 1 and subject to the restrictions set out in clause 2 (as limited, extended or otherwise varied by any terms, including product-specific permitted uses and restrictions, set out in the Special Conditions). Except as expressly permitted by this License, you and your Permitted Users shall NOT copy, modify, sub-license, redistribute or otherwise use any component of the Arm Tools.
+2.      LICENSE GRANT
+2.1     Subject to your compliance with the terms and conditions of this License, and payment by you of the Fees (if any), Arm hereby grants to you and your Permitted Users during the License Term a non-exclusive, non-transferable license to receive and use the Arm Tools, certain components thereof, or optional functionality, in the Territory only on the Licensed Seats or for a Specified Project (as applicable) for the permitted uses set out in this clause 2 and subject to the restrictions set out in clause 3 (as limited, extended or otherwise varied by any terms, including product-specific permitted uses and restrictions, set out in the Special Conditions). Except as expressly permitted by this License, you and your Permitted Users shall NOT copy, modify, sub-license, redistribute or otherwise use any component of the Arm Tools.
 
-1.2 PERMITTED USE OF THE ARM TOOLS: Except as otherwise provided in this License, use of the Arm Tools (or components thereof) is permitted for the purpose of:
+2.2 PERMITTED USE OF THE ARM TOOLS: Except as otherwise provided in this License, use of the Arm Tools (or components thereof) is permitted for the purpose of:
 (a) building, developing, testing, debugging, analysing and optimising Your Software or Your Hardware;
 (b) generation of Your Reports, and use of Your Reports to develop, test, debug, analyse and optimise Your Software or Your Hardware; and
-(c) only as expressly provided in the relevant Redistributables File: (i) incorporating, compiling and/or linking the files listed in that Redistributables File into Your Software, provided that Your Software contains substantial additional functionality; and (ii) subject to clause 2.1 below, reproducing and redistributing the files (and permitting your customers and/or your authorised distributors to reproduce and redistribute the files), only in object code form (unless otherwise specified in the relevant Redistributables Files), and only as part of Your Software. You agree that, except as expressly provided to the contrary in the relevant Redistributables File, you may only copy the Arm Tools (or any component thereof) to the extent that such copying is incidental to the permitted uses set out in this clause 1.2, including installation, backup and execution.
-
-2. YOUR OBLIGATIONS AND RESTRICTIONS ON USE
-2.1 OBLIGATIONS RELATING TO REDISTRIBUTION: Any redistribution as permitted by this License is subject to any restrictions set out in the applicable Special Conditions, and your compliance with the following:
-(a) in cases where you are expressly permitted under this License (including for the avoidance of doubt by inclusion of agreed wording in the order documentation provided to you by Arm) to sub-license or redistribute any component of the Arm Tools to your customers, authorised distributors or other third parties, you are responsible for ensuring that such customers, authorised distributors and third parties accept, and are contractually bound (by agreement with you or directly with Arm) to comply with, the terms and conditions of this License;
-(b) Any use by you of Arm's or any of its licensors' names, logos or trademarks to publicise or market any of Your Software containing (or developed or generated using) Arm Tools is subject to you obtaining express written permission from Arm;
-(c) You warrant that you shall not make any representations or warranties on behalf of Arm in respect of any of the Arm Tools or in respect of any other software, reports or documentation developed or generated by you in accordance with the license grants set out in this License;
-(d) You must reproduce or preserve (as applicable) any copyright notices which are included in or with any Arm Tools or components thereof; and
-(e) Except as otherwise agreed by Arm (including for the avoidance of doubt by inclusion of the relevant permission in a Supplementary Terms File), you may not disclose or otherwise distribute any Arm Tools Performance Data. For the avoidance of doubt, nothing in this sub-clause 2.1 (e) shall prevent you from disclosing or otherwise distributing Your Reports.
-
-2.2 NON-COMMERCIAL USE AND FREE OF CHARGE LICENSES: If you are in receipt of a Non-Commercial Use License for the Arm Tools, or the Arm Tools or any component thereof are identified or classified as such, and/or you are receiving the Arm Tools free of charge, then notwithstanding any of the other terms and conditions of this License, your use (which includes use by your Permitted Users) of the Arm Tools is limited as follows:
-(a) if you are receiving the Arm Tools free of charge:
-(i) no support or maintenance shall be provided to you in respect of the Arm Tools;
-(ii) the warranty set out in clause 7.1 of this License does not apply to you or your use of the Arm Tools, and Arm gives no other warranty whatsoever in relation to (and accepts no liability in connection with) the Arm Tools or your use (as permitted by this License) of them;
-(iii) Arm may immediately terminate this License at any time for any reason by giving written notice to you;
-(iv) except as otherwise expressly agreed in writing by Arm, you shall grant to Arm in full the license set out in clause 3.2 of this License; and/or
-(b) if you are receiving a Non-Commercial Use License or version (as applicable) of the Arm Tools:
-(i) you and your Permitted Users may use the Arm Tools for internal use only; and
-(ii) you are not permitted to distribute or sub-license (A) any part of the Arm Tools, or (B) Your Software, Your Hardware, or Your Reports developed under this License using the Arm Tools. The Arm Tools shall be used only by you and your Permitted Users, and you shall not (except as otherwise authorised in writing by Arm) allow any other third party whatsoever to use the Arm Tools.
+(c) only as expressly permitted in the relevant Redistributables File: (i) incorporating, compiling and/or linking the files listed in that Redistributables File into Your Software, provided that Your Software contains substantial additional functionality; and (ii) subject to clause 3.1 below, reproducing and redistributing the files (and permitting your customers and/or your authorised distributors to reproduce and redistribute the files), only in object code form (unless otherwise specified in the relevant Redistributables Files), and only as part of Your Software. You agree that, except as expressly provided to the contrary in the relevant Redistributables File, you may only copy the Arm Tools (or any component thereof) to the extent that such copying is incidental to the permitted uses set out in this clause 2.2, including installation, backup and execution.
+
+3.      YOUR OBLIGATIONS AND RESTRICTIONS ON USE
+3.1     OBLIGATIONS RELATING TO REDISTRIBUTION: Any redistribution as permitted by this License is subject to any restrictions set out in the applicable Special Conditions, and your compliance with the following:
+(a)     in cases where you are expressly permitted under this License (including for the avoidance of doubt by inclusion of agreed wording in the order documentation provided to you by Arm) to sub-license or redistribute any Arm Tool or component thereof to your customers, authorised distributors or other third parties, you are responsible for ensuring that such customers, authorised distributors and third parties accept, and are contractually bound (by agreement with you or directly with Arm) to comply with, the terms and conditions of this License;
+(b)     any use by you of Arm's or any of its licensors' names, logos or trademarks to publicise or market any of Your Software containing (or developed or generated using) Arm Tools is subject to you obtaining express written permission from Arm;
+(c)     you warrant that you shall not make any representations or warranties on behalf of Arm in respect of any of the Arm Tools or in respect of any other software, reports or documentation developed or generated by you in accordance with the license grants set out in this License;
+(d)     you must reproduce or preserve (as applicable) any copyright notices which are included in or with any Arm Tools or components thereof; and
+(e)     except as otherwise agreed by Arm (including for the avoidance of doubt by inclusion of the relevant permission in a Supplementary Terms File), you may not disclose or otherwise distribute any Arm Tools Performance Data. For the avoidance of doubt, nothing in this sub-clause 3.1 (e) shall prevent you from disclosing or otherwise distributing Your Reports.
+
+3.2     NON-COMMERCIAL USE AND FREE OF CHARGE LICENSES: If you are in receipt of a Non-Commercial Use License for the Arm Tools, or the Arm Tools or any component thereof are identified or classified as such, and/or you are receiving the Arm Tools free of charge, then notwithstanding any of the other terms and conditions of this License, your use (which includes use by your Permitted Users) of the Arm Tools is limited as follows:
+(a)     if you are receiving the Arm Tools free of charge:
+(i)     no support or maintenance shall be provided to you in respect of the Arm Tools;
+(ii)    the warranty set out in clause 8.1 of this License does not apply to you or your use of the Arm Tools, and Arm gives no other warranty whatsoever in relation to (and accepts no liability in connection with) the Arm Tools or your use (as permitted by this License) of them;
+(iii)   Arm may immediately terminate this License at any time for any reason by giving written notice to you;
+(iv)    except as otherwise expressly agreed in writing by Arm, you shall grant to Arm in full the license set out in clause 4.2 of this License; and/or
+(b)     if you are receiving a Non-Commercial Use License or version (as applicable) of the Arm Tools:
+(i)     you and your Permitted Users may use the Arm Tools for internal use only; and
+(ii)    you are not permitted to distribute or sub-license (A) any part of the Arm Tools, or (B) Your Software, Your Hardware, or Your Reports developed under this License using the Arm Tools. The Arm Tools shall be used only by you and your Permitted Users, and you shall not (except as otherwise authorised in writing by Arm) allow any other third party whatsoever to use the Arm Tools.
 For the avoidance of doubt, if you are receiving a Non-Commercial Use License and the license is provided to you free of charge, the restrictions in both sub-clauses (a) and (b) above will apply to your use of the Arm Tools.
 
-2.3 LICENSE TYPES: Depending on the type of license you have agreed to purchase from Arm under this License (the details of which are set out in the order documentation provided to you by Arm), your use of the Arm Tools shall be limited to:
-(a) use of each Licensed Seat (i) by one individual named Permitted User only on a specified item of computer hardware ('named-user license'), OR (ii) by one individual Permitted User at a time only on a specified item of computer hardware ('node-locked license'), OR (iii) by one individual Permitted User at a time on specified items of computer hardware ('floating license'). In respect of 'node-locked licenses', each Licensed Seat may only be used for one 'process' at any one time. For the purpose of this sub-clause 2.3 (a), each 'process' is the execution of an instance of an Arm Tool; or
-(b) use for a Specified Project.
+3.3     RESTRICTIONS RELATING TO LICENSE TYPES: Depending on the type of license you have purchased from Arm under this License (the details of which shall be set out in the order documentation provided to you by Arm), your use of each Licensed Seat of an Arm Tool shall be limited to:
+(a)     for a 'Node Locked License', use only (i) on one specified item of computer hardware, and (ii) at any point in time, by one individual Permitted User for one 'process'. For the purpose of this sub-clause 3.3 (a), each 'process' is the execution of an instance of an Arm Tool;
+(b)     for a 'Floating License', use only by one individual Permitted User at a time on specified items of computer hardware;
+(c)     for an 'Authorised User License', use only by (i) one individual assigned Permitted User, OR (ii) one assigned Automation Process, provided always that only Permitted Users that have a valid Authorised User License for an Arm Tool shall be permitted to deliver to an Automation Process jobs generated using that Arm Tool. For the purposes of this sub-clause 3.3 (c), "Automation Process" means a process or processes used to automate certain software methods, such as continuous integration; or
+(d)     in respect of a 'Specified Project License', use for a Specified Project.
 
-2.4 PERMITTED USERS: You hereby agree to be responsible for the acts and omissions of any and all Permitted Users, and shall ensure that such Permitted Users (i) are contractually obliged to comply with the terms of this License, including those relating to confidentiality; and (ii) do not supply the Arm Tools or any components thereof to any third party whatsoever. Except as expressly provided in this License or as agreed in writing by Arm on a case by case basis, you shall not sub-license, redistribute, lease, rent or otherwise allow any third party to use the Arm Tools or License Keys.
+3.4     PERMITTED USERS: You hereby agree to be responsible for the acts and omissions of any and all Permitted Users, and shall ensure that such Permitted Users (i) are contractually obliged to comply with the terms of this License, including those relating to confidentiality; and (ii) do not supply Arm Tools or any components thereof to any third party whatsoever. Except as expressly provided in this License or as agreed in writing by Arm on a case by case basis, you shall not sub-license, redistribute, lease, rent or otherwise allow any third party to use the Arm Tools or License Keys.
 
-2.5 REVERSE ENGINEERING: Your use of the Arm Tools shall specifically exclude the reverse engineering, decompiling, disassembly, translation, adaptation, arrangement or other alteration of any part of the Arm Tools (except to the extent that applicable law overrides this provision or any part hereof).
+3.5     REVERSE ENGINEERING: Your use of Arm Tools shall specifically exclude the reverse engineering, decompiling, disassembly, translation, adaptation, arrangement or other alteration of any part of the Arm Tools (except to the extent that applicable law overrides this provision or any part hereof).
 
-2.6 COPYRIGHT AND RESERVATION OF RIGHTS: The Arm Tools are owned by Arm and/or its licensors and are protected by copyright and other intellectual property rights, laws and international treaties. The Arm Tools are licensed not sold. Except as expressly provided by this License, you acquire no rights to the Arm Tools or any element thereof, or to any other Arm products or services. You shall not remove from the Arm Tools any copyright notice or other notice and shall ensure that any such notice is reproduced in any permitted reproduction of the whole or any part of the Arm Tools.
+3.6     COPYRIGHT AND RESERVATION OF RIGHTS: Arm Tools are owned by Arm and/or its licensors and are protected by copyright and other intellectual property rights, laws and international treaties. Arm Tools are licensed not sold. Except as expressly provided by this License, you acquire no rights to any Arm Tools or elements thereof, or to any other Arm products or services. You shall not remove from Arm Tools any copyright notice or other notice and shall ensure that any such notice is reproduced in any permitted reproduction of the whole or any part of the Arm Tools.
 
-2.7 TECHNICAL RESTRICTIONS IN THE ARM TOOLS: You must comply with any technical restrictions in the Arm Tools and License Keys, including any restrictions that restrict use to certain components of the Arm Tools or use only for certain purposes. You shall not work around any such technical restrictions.
+3.7     TECHNICAL RESTRICTIONS IN THE ARM TOOLS: You must comply with any technical restrictions in Arm Tools and License Keys, including any restrictions that restrict use to certain components of Arm Tools or use only for certain purposes. You shall not work around any such technical restrictions.
 
-2.8 ARM DOCUMENTATION: You may use the Arm Documentation (if any) internally only in conjunction with your use of the Arm Software to which it relates.
+3.8     ARM DOCUMENTATION: Use of Arm Documentation (if any) is permitted internally only in conjunction with your use of the Arm Software to which it relates.
 
-3. LICENSE OF FEEDBACK TO ARM
-3.1 You may at your discretion deliver any suggestions, comments, feedback, ideas, or know-how (whether in oral or written form) to Arm relating to or connected with your use of the Arm Tools ("Feedback"). Notwithstanding the foregoing, you shall not knowingly give to Arm any Feedback that you are aware (or should reasonably be aware) is subject to any patent, copyright or other intellectual property claim or right of any third party.
+4. LICENSE OF FEEDBACK TO ARM
+4.1     You may at your discretion deliver any suggestions, comments, feedback, ideas, or know-how (whether in oral or written form) to Arm relating to or connected with your use of Arm Tools ("Feedback"). Notwithstanding the foregoing, you shall not knowingly give to Arm any Feedback that you are aware (or should reasonably be aware) is subject to any patent, copyright or other intellectual property claim or right of any third party.
 
-3.2 Except as expressly notified by you to Arm (in writing which may include email) to the contrary, you hereby grant to Arm under your and your affiliates (as applicable) intellectual property, a perpetual, irrevocable, royalty free, non-exclusive, worldwide license to: (i) use, copy, modify, and create derivative works of the Feedback; (ii) sell, supply or otherwise distribute the whole or any part of the Feedback (and derivative works thereof) as part of any Arm owned or licensed product(s) without obligation or restriction of any kind; and (iii) sub-license to third parties the foregoing rights, including the right to sub-license to further third parties. No right is granted by you to Arm to sub-license your and your affiliates (as applicable) intellectual property except to the extent that it is provided to Arm as Feedback and is embodied in any Arm owned or licensed product(s). For the avoidance of doubt, if, during the License Term, you provide notice to Arm revoking the license granted under this clause 3.2, you acknowledge and agree that such revocation shall not apply to Feedback delivered to Arm prior to the date of receipt of the revocation notice, and that (notwithstanding the foregoing) Arm shall continue to be permitted to use Feedback received after the date of receipt of the revocation notice for internal purposes.
+4.2     Except as expressly notified by you to Arm (in writing which may include email) to the contrary, you hereby grant to Arm under your and your affiliates (as applicable) intellectual property rights, a perpetual, irrevocable, royalty free, non-exclusive, worldwide license to: (i) use, copy, modify, and create derivative works of the Feedback; (ii) sell, supply or otherwise distribute the whole or any part of the Feedback (and derivative works thereof) as part of any Arm owned or licensed product(s) without obligation or restriction of any kind; and (iii) sub-license to third parties the foregoing rights, including the right to sub-license to further third parties. No right is granted by you to Arm to sub-license your and your affiliates (as applicable) intellectual property rights except to the extent that it is provided to Arm as Feedback and is embodied in any Arm owned or licensed product(s). For the avoidance of doubt, if, during the License Term, you provide notice to Arm revoking the license granted under this clause 4.2, you acknowledge and agree that such revocation shall not apply to Feedback delivered to Arm prior to the date of receipt of the revocation notice, and that (notwithstanding the foregoing) Arm shall continue to be permitted to use Feedback received after the date of receipt of the revocation notice for internal purposes.
 
-3.3 Except as expressly licensed to Arm in clause 3.2, you retain all right, title and interest in and to the Feedback provided by you under this License.
+4.3     Except as expressly licensed to Arm in clause 4.2, you retain all right, title and interest in and to the Feedback provided by you under this License.
 
-4. DATA COLLECTION AND PRIVACY
-4.1 The Arm Software may include features that enable it to transmit certain computer information over the internet to Arm's and/or its service providers' computer systems, for example your computer's internet protocol address, computer hardware and operating system details, or the serial numbers of the Arm Tools you have licensed. This information will not be shared with any third parties, and shall be used by Arm only for the purpose of Arm protecting its legitimate interests, which may include Arm verifying your right to use the Arm Tools and monitoring your compliance with the permitted uses and restrictions set out in this License.
+5. DATA COLLECTION AND PRIVACY
+5.1     Arm Software may include features that enable it to transmit certain computer information over the internet to Arm's computer systems. Any non-anonymous data collected by Arm, for example your computer's internet protocol address, computer hardware and operating system details, or the serial numbers of Arm Tools you have licensed, shall be used by Arm only for the purpose of Arm protecting its legitimate interests, which may include Arm verifying your right to use any Arm Tools and monitoring your compliance with the permitted uses and restrictions set out in this License.
 
-4.2 Arm may also collect anonymous data, which, for the avoidance of doubt, cannot be used to identify individual users of the Arm Tools. This information may be used by Arm to help us understand and analyse what components or features in the Arm Tools our end users are using in order to (i) maintain and improve the quality of the Arm Tools and the end user experience, (ii) inform end users of relevant new and improved products and services, and (iii) assist end users to maximise the performance of, or solve user experience issues with, the Arm Tools.
+5.2     Arm may also collect anonymous data, which, for the avoidance of doubt, cannot be used to identify individual users of Arm Tools. This information may be used by Arm to help us understand and analyse what components or features in Arm Tools our end users are using in order to (i) maintain and improve the quality of the Arm Tools and the end user experience, (ii) inform end users of relevant new and improved products and services, and (iii) assist end users to maximise the performance of, or solve user experience issues with, the Arm Tools.
 
-4.3 Information collected by the Arm Software will only be used for the aforementioned purposes. Please refer to the Arm Privacy Policy https://www.arm.com/company/policies/privacy for further information on how Arm collects, uses and safeguards personal data (including but not limited to personal data collected for the protection of Arm's legitimate interests and your rights to object to its collection).
+5.3     Information collected by Arm Software will only be used for the aforementioned purposes. Please refer to the Arm Privacy Policy https://www.arm.com/company/policies/privacy for further information on how Arm collects, uses and safeguards personal data (including but not limited to personal data collected for the protection of Arm's legitimate interests and your rights to object to its collection).
 
-5. SUPPORT AND MAINTENANCE
-5.1 Provision of reasonable support and maintenance is subject to payment by you of all applicable Fees.
+6. SUPPORT AND MAINTENANCE
+6.1     Provision of reasonable support and maintenance is subject to payment by you of all applicable Fees.
 
-5.2 Any support provided by Arm in accordance with the above clause 5.1 shall (i) be provided by telephone, email or such other format as is designated by Arm, (ii) be prioritised at Arm's discretion, and (iii) not be used as a substitute for training or as additional resource for your projects.
+6.2     Any support provided by Arm in accordance with the above clause 6.1 shall (i) be provided by telephone, email or such other format as is designated by Arm, (ii) be prioritised at Arm's discretion, and (iii) not be used as a substitute for training or as additional resource for your projects.
 
-5.3 Maintenance will generally be provided in the form of Updates to the Arm Tools. Arm shall be under no obligation to provide such maintenance in respect of any modifications made by you (where permitted) to the Arm Tools. Updates do not constitute additional Licensed Seats and may only be used by you if you have an active Licensed Seat to run and use such Updates. Updates will generally be provided to you as soon as reasonably practicable following the date of general public release of the Update by Arm.
+6.3     Maintenance will generally be provided in the form of Updates to Arm Tools. Arm shall be under no obligation to provide such maintenance in respect of any modifications made by you (where permitted) to Arm Tools. Updates do not constitute additional Licensed Seats and may only be used by you if you have an active Licensed Seat to run and use such Updates. Updates will generally be provided to you as soon as reasonably practicable following the date of general public release of the Update by Arm.
 
-5.4 In cases where the Arm Tools were provided to you free of charge, you are not entitled to any support or maintenance for the Arm Tools from Arm, but Arm may, in its sole discretion, provide support to you. If you obtained the Arm Tools from an Arm authorised distributor, reseller or other third party, support and maintenance may be provided by either Arm or the third party as per the terms of your contract for supply. Arm shall not be responsible for any delay or failure in connection with any third party supplier providing support or maintenance that it is obligated to provide to you. Please refer to the 'Support' area of https://www.arm.com for details of Arm's support services, relevant contact details, and (if applicable) details of other authorised support channels.
+6.4     In cases where the Arm Tools were provided to you free of charge, you are not entitled to any support or maintenance for the Arm Tools from Arm, but Arm may, in its sole discretion, provide support to you. If you obtained the Arm Tools from an Arm authorised distributor, reseller or other third party, support and maintenance may be provided by either Arm or the third party as per the terms of your contract for supply. Arm shall not be responsible for any delay or failure in connection with any third party supplier providing support or maintenance that it is obligated to provide to you. Please refer to the 'Support' area of https://www.arm.com for details of Arm's support services, relevant contact details, and (if applicable) details of other authorised support channels.
 
-5.5 Arm's obligations under this clause 5 are limited to the provision of support and maintenance to you, and Arm is under no obligation to provide any support and maintenance to any third parties. You agree to provide all front line support services to all third parties to whom you distribute any Arm Tools, Your Reports, Your Software or Your Hardware, pursuant to and in accordance with the terms of this License.
+6.5     Any obligation Arm has under this clause 6 is limited to the provision of support and maintenance to you, and Arm is under no obligation to provide any support and maintenance to any third parties. You agree to provide all front line support services to all third parties to whom you distribute any Arm Tools, Your Reports, Your Software or Your Hardware, pursuant to and in accordance with the terms of this License.
 
-5.6 This License does not grant you any entitlement to receive (i) Upgrades, (ii) Arm products other than those specified in your product documentation, or (iii) any new products developed or introduced by Arm from time to time, nor to receive any support or maintenance in respect of the same.
+6.6     This License does not grant you any entitlement to receive (i) Upgrades, (ii) Arm products other than those specified in your product documentation, or (iii) any new products developed or introduced by Arm from time to time, nor to receive any support or maintenance in respect of the same.
 
-6. CONFIDENTIALITY
-6.1 You acknowledge that the Arm Tools, License Keys, Arm Tools Performance Data, and any and all other software, documentation or other information licensed to you by Arm, or provided to you during discussions about or in connection with the Arm Tools (including this License and information provided during the provision by Arm of any support), contain trade secrets and confidential information of Arm ("Confidential Information").
+7. CONFIDENTIALITY
+7.1 You acknowledge that the Arm Tools, License Keys, Arm Tools Performance Data, and any and all other software, documentation or other information licensed to you by Arm, or provided to you during discussions about or in connection with the Arm Tools (including this License and information provided during the provision by Arm of any support), contain trade secrets and confidential information of Arm ("Confidential Information").
 
-6.2 You agree to maintain all such Confidential Information in confidence and apply security measures (such measures to be no less stringent than the measures which you apply (or should reasonably apply) to protect your own like information, but not less than a reasonable degree of care) to prevent their unauthorised disclosure and use.
+7.2 You agree to maintain all such Confidential Information in confidence and apply security measures (such measures to be no less stringent than the measures which you apply (or should reasonably apply) to protect your own like information, but not less than a reasonable degree of care) to prevent their unauthorised disclosure and use.
 
-6.3 Subject to any restrictions imposed by applicable law, the period of confidentiality shall be five (5) years from the date of disclosure of the Confidential Information. You agree that you shall not use any such information other than in your normal use of the Arm Tools as permitted by this License.
+7.3 Subject to any restrictions imposed by applicable law, the period of confidentiality shall be indefinite. You agree that you shall not use any such information other than in your normal use of the Arm Tools as permitted by this License.
 
-7. LIMITED WARRANTIES
-7.1 Subject to the restrictions in clause 2, for the period of ninety (90) days from the date of receipt by you of the Arm Tools, Arm warrants to you that (i) the media on which any Arm Software is provided shall be free from defects in materials and workmanship under normal use; and (ii) the Arm Software will perform substantially in accordance with the accompanying Arm Documentation (if any). Arm's total liability and your exclusive remedy for breach of these warranties shall be limited to Arm, at Arm's option (a) replacing the defective Arm Software; or (b) using reasonable efforts to correct material, documented, reproducible defects in the Arm Software and delivering such corrected Arm Software to you; or (c) if you licensed the Arm Software directly from Arm, refunding the price paid by you to Arm for that Arm Software. Any replacement Arm Software will be warranted for the remainder of the original warranty period or thirty (30) days from the date of replacement, whichever is longer.
+8 LIMITED WARRANTIES
+8.1     For the period of ninety (90) days from the date of receipt by you of Arm Tools, Arm warrants to you that; (i) Arm Software will perform substantially in accordance with the accompanying Arm Documentation (if any); and (ii) Arm Software will be compatible with the hardware and software mentioned as such in the Arm Documentation. Arm's total liability and your exclusive remedy for breach of these warranties shall be limited to Arm, at Arm's option (a) replacing any defective Arm Software; or (b) using reasonable efforts to correct material, documented, reproducible defects in the Arm Software and delivering such corrected Arm Software to you; or (c) if you licensed the Arm Software directly from Arm, refunding the price paid by you to Arm for that Arm Software. Any replacement Arm Software will be warranted for the remainder of the original warranty period or thirty (30) days from the date of replacement, whichever is longer.
 
-7.2 The Arm Software described in any Arm Documentation is subject to continuous development and improvement. All particulars of the Arm Software and its use as described in the Arm Documentation are given by Arm in good faith. Consequently, the information contained in the Arm Documentation is subject to change without notice and is not warranted to be error free. If you discover any errors in the Arm Documentation please report them to Arm in writing. Any Arm Documentation provided to you that relates to specific industry quality and functional safety standard compliance may assist you in applying to a competent auditor for certification of Your Software or Your Hardware, but you acknowledge and agree that on its own such Arm Documentation may not provide sufficient evidence of, or be compatible with, the required safety compliance standards.
+8.2     Arm Software described in any Arm Documentation is subject to continuous development and improvement. All particulars of Arm Software and its use as described in the applicable Arm Documentation are given by Arm in good faith. Consequently, the information contained in Arm Documentation is subject to change without notice and is not warranted to be error free. If you discover any errors in Arm Documentation please report them to Arm in writing. Any Arm Documentation provided to you that relates to specific industry quality and functional safety standard compliance may assist you in applying to a competent auditor for certification of Your Software or Your Hardware, but you acknowledge and agree that on its own such Arm Documentation may not provide sufficient evidence of, or be compatible with, the required safety compliance standards.
 
-7.3 Except as provided in clause 7.1 above, you agree that the Arm Tools are licensed "as is", and that Arm expressly disclaims all representations, warranties, conditions or other terms, express or implied or statutory, including without limitation the implied warranties of non-infringement, satisfactory quality, and fitness for a particular purpose. You acknowledge that it is your responsibility to satisfy yourself that the Arm Tools are fit for the intended purpose and satisfy your requirements, including compatibility with Your Hardware, and you expressly assume all liabilities and risks relating to (i) any use of an Arm Tool which is inconsistent with its design or any guidance provided to you in the applicable Arm Documentation, and/or (ii) any use of an Arm Tool with Your Software or Your Hardware where such software or hardware (as applicable) is not supported by or compatible with the relevant Arm Tool.
+8.3     Except as provided in clause 8.1 above, you agree that Arm Tools, and any associated support and maintenance, are licensed or provided (as applicable) "as is", and that Arm and its licensors expressly disclaim all representations, warranties, conditions or other terms, express or implied or statutory, including, without limitation, the implied warranties of merchantability, non-infringement, satisfactory quality, and fitness for a particular purpose. You acknowledge that it is your responsibility to satisfy yourself that any Arm Tools are fit for the intended purpose and satisfy your requirements, including compatibility with Your Hardware, and you expressly assume all liabilities and risks relating to (i) any use of an Arm Tool which is inconsistent with its design or any guidance provided to you in the applicable Arm Documentation, and/or (ii) any use of an Arm Tool with Your Software or Your Hardware where such software or hardware (as applicable) is not supported by or compatible with the relevant Arm Tool.
 
-7.4 You expressly assume all liabilities and risks relating to your use or operation of Your Software and Your Hardware designed or modified using the Arm Tools, including without limitation, Your software or Your Hardware designed or intended for safety-critical applications. Should Your Software or Your Hardware prove defective, you assume the entire cost of all necessary servicing, repair or correction.
+8.4     You expressly assume all liabilities and risks relating to your use or operation of Your Software and Your Hardware designed or modified using Arm Tools, including without limitation, Your software or Your Hardware designed or intended for safety-critical applications. Should Your Software or Your Hardware prove defective, you assume the entire cost of all necessary servicing, repair or correction.
 
-8. LIMITATION OF LIABILITY
-8.1 To the maximum extent permitted by applicable law, in no event shall Arm be liable for any indirect, special, incidental or consequential damages (including loss of profits) arising out of the use of, or inability to use, the Arm Tools, whether based on a claim under contract, tort or otherwise, even if Arm was advised of the possibility of such damages.
+9 LIMITATION OF LIABILITY
+9.1     To the maximum extent permitted by applicable law, in no event shall Arm be liable for any indirect, special, incidental or consequential damages (including loss of profits) arising out of the use of, or inability to use, Arm Tools, whether based on a claim under contract, tort or otherwise, even if Arm was advised of the possibility of such damages.
 
-8.2 Arm does not seek to limit or exclude liability for death or personal injury arising from Arm's negligence or Arm's fraud. Arm acknowledges that certain jurisdictions do not permit the exclusion or limitation of liability for consequential or incidental damages, and in such cases the above limitation relating to liability for consequential damages may not apply to you.
+9.2     Arm does not seek to limit or exclude liability for death or personal injury arising from Arm's negligence or Arm's fraud. Arm acknowledges that certain jurisdictions do not permit the exclusion or limitation of liability for consequential or incidental damages, and in such cases the above limitation relating to liability for consequential damages may not apply to you.
 
-8.3 Notwithstanding anything to the contrary contained in this License, the maximum liability of Arm to you in aggregate (in contract, tort or otherwise) in relation to or in connection with the subject matter of this License shall not exceed the greater of (i) the total sums paid by you to Arm (if any) for this License, and (ii) $10.00 USD. The existence of more than one claim will not enlarge or extend the limit.
+9.3     Notwithstanding anything to the contrary contained in this License, the maximum liability of Arm to you in aggregate (in contract, tort or otherwise) in relation to or in connection with the subject matter of this License shall not exceed the greater of (i) the total sums paid by you to Arm (if any) for this License, and (ii) $10.00 USD. The existence of more than one claim or suit will not enlarge or extend the limit. You release Arm from all obligations, liability, claims or demands in excess of this limitation.
 
-9. THIRD PARTY MATERIAL
-9.1 The Arm Tools may contain material owned or developed by third parties, including but not limited to open source software, freeware and commercial software ("Third Party Material"). Any Third Party Material is subject to the terms and conditions of the applicable Third Party Material license(s) and is not covered under the terms of this License. Details relating to such Third Party Material shall either be presented to you at the time of installation or shall be detailed in the Third Party Licenses File(s). Your use of such Third Party Material is subject to your compliance with the applicable Third Party Material license(s).
+10 THIRD PARTY MATERIAL
+10.1    Arm Tools may contain material owned or developed by third parties, including but not limited to open source software, freeware and commercial software ("Third Party Material"). Details relating to such Third Party Material shall be detailed in the Third Party Licenses File(s). Your use of such Third Party Material is subject to your compliance with the applicable Third Party Material license(s).
 
-9.2 Arm hereby disclaims any and all warranties express or implied from any third parties regarding, or otherwise connected with, any Third Party Material included in the Arm Tools and any Third Party Material from which the Arm Tools are derived, and/or your use of any or all of the Third Party Material in connection with Your Software or Your Hardware, including (without limitation) any warranties of satisfactory quality or fitness for a particular purpose.
+10.2    Arm hereby disclaims any and all warranties express or implied from any third parties regarding, or otherwise connected with, any Third Party Material included in Arm Tools and any Third Party Material from which any Arm Tools are derived, and/or your use of any or all of the Third Party Material in connection with Your Software or Your Hardware, including (without limitation) any warranties of satisfactory quality or fitness for a particular purpose.
 
-9.3 No Third Party Material licensors shall have any liability for any direct, indirect, incidental, special, exemplary, or consequential damages (including without limitation lost profits) howsoever caused and whether made under contract, tort or otherwise arising in any way out of your use or distribution of the Third Party Material or the exercise of any rights granted under either or both this License and the legal terms applicable to any Third Party Material, even if advised in advance of the possibility of such damages.
+10.3    No Third Party Material licensors shall have any liability for any direct, indirect, incidental, special, exemplary, or consequential damages (including without limitation lost profits) howsoever caused and whether made under contract, tort or otherwise arising in any way out of your use or distribution of the Third Party Material or the exercise of any rights granted under this License, even if advised in advance of the possibility of such damages.
 
-10. GOVERNMENT REQUIREMENTS
-10.1 To the extent that you are an agency, contractor or instrumentality of the U.S. Government, you and we agree that:
-(a) the Arm Tools are commercial computer software and commercial computer software documentation, and that your rights therein are as specified in this License, per FAR 12.212 and DFARS 227.7202-3, as applicable, or in the case of NASA, subject to NSF 1852.22786. Arm acknowledges that, whilst commercial computer software or commercial computer software documentation shall be acquired under licenses customarily provided to the public, such licenses must be consistent with U.S. Federal law and otherwise satisfy the U.S. Government's needs ("U.S. Government Requirements"); and
-(b) you may assign your rights under this License to the relevant US Government Federal Department or the successor contractor designated by the US Government Federal Department upon termination of your related prime contract with that US Government Federal Department. If you exercise your rights under this clause 10.1(b), you acknowledge and agree that you shall remain liable to Arm in respect of all your obligations under this License.
+11.     GOVERNMENT REQUIREMENTS
+11.1    To the extent that you are an agency, contractor or instrumentality of the U.S. Government, you and we agree that:
+(a)     Arm Tools are commercial computer software and commercial computer software documentation, and that your rights therein are as specified in this License, per FAR 12.212 and DFARS 227.7202-3, as applicable, or in the case of NASA, subject to NSF 1852.22786. Arm acknowledges that, whilst commercial computer software or commercial computer software documentation shall be acquired under licenses customarily provided to the public, such licenses must be consistent with U.S. Federal law and otherwise satisfy the U.S. Government's needs ("U.S. Government Requirements"); and
+(b)     you may assign your rights under this License to the relevant US Government Federal Department or the successor contractor designated by the US Government Federal Department upon termination of your related prime contract with that US Government Federal Department. If you exercise your rights under this clause 11.1(b), you acknowledge and agree that you shall remain liable to Arm in respect of all your obligations under this License.
 
-10.2 If there is any material inconsistency between (i) either a U.S. Government Requirement or a requirement of another government with which Arm is mandated by statute to comply and (ii) any provision of this License, the terms of the relevant government requirement shall prevail and the provision in question shall be deemed varied or deleted (as applicable) as required by the terms of the relevant government requirement. For the avoidance of doubt, in such circumstances, all other terms, conditions and provisions of this License will continue to be valid to the fullest extent permitted by law in accordance with the below clause 12.3.
+11.2    If there is any material inconsistency between (i) either a U.S. Government Requirement or a requirement of another government with which Arm is mandated by statute to comply and (ii) any provision of this License, the terms of the relevant government requirement shall prevail and the provision in question shall be deemed varied or deleted (as applicable) as required by the terms of the relevant government requirement. For the avoidance of doubt, in such circumstances, all other terms, conditions and provisions of this License will continue to be valid to the fullest extent permitted by law in accordance with the below clause 13.3.
 
-11. TERM AND TERMINATION
-11.1 Subject to clauses 11.2 and 11.3 below, this License shall remain in force until terminated by you, by Arm or (in the case of a time limited license) by expiry.
+12.     TERM AND TERMINATION
+12.1    Subject to clauses 12.2 and 12.3 below, this License shall remain in force until terminated by you, by Arm or (in the case of a time limited license) by expiry.
 
-11.2 In the event of a party breaching of any of the terms and conditions of this License, which if capable of remedy, has not been remedied by that party within thirty (30) days of the date of breach, without prejudice to any of its other rights under this License, the non-breaching party may terminate this License immediately upon giving written notice to the breaching party. Upon termination of this License by you or by Arm, or upon expiry, you shall (and shall ensure that your Permitted Users shall) immediately (i) stop using the Arm Tools (or any element thereof) and any Confidential Information and, (ii) destroy all copies of the same in your possession or control, together with all Arm Documentation and related materials.
+12.2    In the event of a party breaching of any of the terms and conditions of this License, which if capable of remedy, has not been remedied by that party within thirty (30) days of the date of breach, without prejudice to any of its other rights under this License, the non-breaching party may terminate this License immediately upon giving written notice to the breaching party. Upon termination of this License by you or by Arm, or upon expiry, you shall (and shall ensure that your Permitted Users shall) immediately (i) stop using the relevant Arm Tools (or any element thereof) and any Confidential Information and, (ii) destroy all copies of the same in your possession or control, together with all Arm Documentation and related materials.
 
-11.3 Notwithstanding the foregoing, except where Arm has terminated this License for your breach, your rights (if applicable) to distribute any of Your Software or Your Hardware developed using the Arm Tools prior to termination or expiry of this License shall (subject to your continued compliance with the terms and conditions of this License) survive such termination or expiry.
+12.3    Notwithstanding the foregoing, except where Arm has terminated this License for your breach, your rights (if applicable) to distribute any of Your Software or Your Hardware developed using the Arm Tools prior to termination or expiry of this License shall (subject to your continued compliance with the terms and conditions of this License) survive such termination or expiry.
 
-12. GENERAL
-12.1 This License is governed by English Law. Notwithstanding the foregoing, to the extent that you are an agency, contractor or instrumentality of the U.S. Government, disputes arising under or relating to this License shall be decided under the U.S. federal law of government contracting, including without limitation the Contract Disputes Act. Nothing in this License shall prevent you from enforcing your intellectual property rights or seeking injunctive or other equitable relief in any court of competent jurisdiction. The parties hereby disclaim application of the United Nations Convention on Contracts for the International Sale of Goods and the Uniform Computer Information Transactions Act.
+12.4    Without limitation to the survival of other terms as expressly set out elsewhere in this License, upon termination or expiry of this License, the provisions of clauses 1, 3.1, 3.5, 4, 7, 8, 9, 10, 12 and 13 shall survive.
 
-12.2 Except where Arm agrees otherwise in (i) a written contract signed by you and Arm, or (ii) a written contract provided by Arm and accepted by you, this is the only agreement between you and Arm relating to the Arm Tools and it may only be modified by written agreement between you and Arm. No terms and conditions contained in any purchase order or other document issued by you, or any advertising or other representation by you or any third party shall add to, supersede or in any way vary the terms and conditions of this License. This License (and any documents expressly incorporated into it by reference herein) represents the entire agreement between you and Arm in relation to its subject matter.
+13.     GENERAL
+13.1    This License is governed by English Law. Notwithstanding the foregoing, to the extent that you are an agency, contractor or instrumentality of the U.S. Government, disputes arising under or relating to this License shall be decided under the U.S. federal law of government contracting, including without limitation the Contract Disputes Act. Nothing in this License shall prevent you from enforcing your intellectual property rights or seeking injunctive or other equitable relief in any court of competent jurisdiction. The parties hereby disclaim application of the United Nations Convention on Contracts for the International Sale of Goods and the Uniform Computer Information Transactions Act.
 
-12.3 If any clause or sentence in this License is held by a court of law to be illegal or unenforceable, the remaining provisions of this License shall not be affected. Any failure by Arm to enforce any of the provisions of this License, unless waived in writing, shall not constitute a waiver of Arm's rights to enforce such provision or any other provision of this License in the future.
+13.2    Except where Arm agrees otherwise in (i) a written contract signed by you and Arm, or (ii) a written contract provided by Arm and accepted by you, this License (including any documents expressly incorporated herein) is the only agreement between you and Arm relating to the Arm Tools and it may only be modified by written agreement between you and Arm. No terms and conditions contained in any purchase order or other document issued by you, or any advertising or other representation by you or any third party shall add to, supersede or in any way vary the terms and conditions of this License. This License (and any documents expressly incorporated into it by reference herein) represents the entire agreement between you and Arm in relation to its subject matter.
+
+13.3    If any clause or sentence in this License is held by a court of law to be illegal or unenforceable, the remaining provisions of this License shall not be affected. Any failure by Arm to enforce any of the provisions of this License, unless waived in writing, shall not constitute a waiver of Arm's rights to enforce such provision or any other provision of this License in the future.
+
+13.4    Subject to clause 11.1(b), neither this License or any rights granted to you under it may be assigned, sub-licensed or otherwise transferred by you to any third party without the prior written consent of Arm. An assignment shall be deemed to include, without limitation (i) any transaction or series of transactions whereby a third party acquires, directly or indirectly, the power to control the management and policies of you, whether through the acquisition of voting securities, by contract or otherwise; and (ii) the sale of more than fifty percent (50%) of your assets whether in a single transaction or series of transactions. Notwithstanding the foregoing, Arm may, in its discretion acting reasonably, separately agree to authorise the re-host of a Licensed Seat (for which additional charges may apply).
+
+13.5    Subject to any applicable legal restrictions, including but not limited to those relating to the security of classified information, at Arm's reasonable request, (i) you agree to check your computers for installations of the Arm Tools, copies of License Keys, contents of any license server log files, individual or concurrent usage of Licensed Seats, and any other information requested by Arm relating to Arm Tools installation, usage and License Key management, and, to provide this information to Arm; and (ii) you agree that Arm may instruct appropriately qualified independent auditors to perform such checks by prior appointment during your normal business hours on reasonable notice. In respect of any audit, Arm shall bear the auditors' costs for that audit unless it reveals unlicensed usage, in which case you shall promptly reimburse Arm for all reasonable costs and expenses, including professional fees, relating to such audit. Any information which is disclosed to Arm or such auditors during checking or audit shall be treated as your confidential information and shall only be used by Arm for compliance and enforcement purposes.
+
+13.6    Arm Confidential Information, Arm Tools and any other Arm products provided under this License may be subject to U.K., European Union, and U.S. export control and sanctions laws and regulations, including the U.S. Export Administration Regulations ("EAR") (hereafter collectively referred to as "Export Regulations"). The parties agree to comply fully with all applicable Export Regulations. You agree that you shall not, either directly or indirectly, export in breach of the Export Regulations any Arm Confidential Information, Arm Tools or other Arm products received under this License, nor any direct products thereof: (i) to any country, company or person subject to export restrictions or sanctions under the applicable Export Regulations without required export authorisation; or (ii) for any prohibited end use, which at the time of export requires an export license or other governmental approval, without first obtaining such license or approval. The specific export controls applicable to any Arm Confidential Information, Arm Tools or other Arm products is determined by the relevant ECCN. Arm will provide ECCNs for licensed products upon request to tradecompliance@arm.com. You are responsible for determining the jurisdiction and classification of the designs you create using Arm Confidential Information, Arm Tools or other Arm products. Arm Confidential Information, Arm Tools or other Arm products provided under this Licensee are dual-use, and are not listed on the UK Military List, nor are they subject to the International Traffic in Arms Regulations (ITAR), the 600 Series of the EAR or other military export control regimes. The parties are prohibited from sharing ITAR-controlled technical data, 600 series-controlled technology, other export controlled military data, or any other data that might require an export license or other export authorisation without prior written consent from the other party. Further, Arm is expressly authorised to use non-U.S. citizens for the performance of this License with the exception of nationals of Country Group E:1 and E:2 as listed in Supp. 1 to Part 740 of the EAR, which shall only be permitted in full compliance with all applicable laws.
+
+13.7    All notices which are required to be given hereunder must be in English and in writing and must be delivered: (i) personally to the other party's employee with the authority to accept such delivery (in which case it will be deemed served immediately), (ii) by first class post (in which case it will be deemed served on the third business day after it was posted) to the Notice Address (as defined below), or (iii) by registered commercial courier (in which case it will be deemed served on the second business day after deposit with the courier) to the Notice Address (as defined below). This clause shall not apply to the service of any proceedings or other documents in a legal action. The "Notice Address" for the purposes of sub-clauses (ii) and (iii) above means 150 Rose Orchard Way, San Jose, CA 95134, Attention: General Counsel. To be effective, any notice delivered pursuant to sub-clauses (i), (ii), or (iii) of this clause 13.7 must also be emailed to litigation@arm.com no later than twenty-four (24) hours after the notice is deemed served.
+
+Arm Document Reference LES-PRE-21260, Version 12.4, Effective Date 22.01.2021
 
-12.4 Subject to clause 10.1(b), neither this License or any rights granted to you under it may be assigned, sub-licensed or otherwise transferred by you to any third party without the prior written consent of Arm. An assignment shall be deemed to include, without limitation (i) any transaction or series of transactions whereby a third party acquires, directly or indirectly, the power to control the management and policies of you, whether through the acquisition of voting securities, by contract or otherwise; and (ii) the sale of more than fifty percent (50%) of your assets whether in a single transaction or series of transactions. Notwithstanding the foregoing, Arm may, in its discretion acting reasonably, separately agree to authorise the re-host of a Licensed Seat (for which additional charges may apply).
 
-12.5 Subject to any applicable legal restrictions, including but not limited to those relating to the security of classified information, at Arm's request, (i) you agree to check your computers for installations of the Arm Tools, copies of License Keys, contents of any license server log files, individual or concurrent usage of Seats, and any other information requested by Arm relating to Arm Tools installation, usage and License Key management, and, to provide this information to Arm; and (ii) you agree that Arm may instruct appropriately qualified independent auditors to perform such checks by prior appointment during your normal business hours on reasonable notice. In respect of any audit, Arm shall bear the auditors' costs for that audit unless it reveals unlicensed usage, in which case you shall promptly reimburse Arm for all reasonable costs and expenses, including professional fees, relating to such audit. Any information which is disclosed to Arm or such auditors during checking or audit shall be treated as your confidential information and shall only be used by Arm for compliance and enforcement purposes.
 
-12.6 The Arm Tools provided under this License are subject to U.S. export control laws, including the U.S. Export Administration Act and its associated regulations, and may be subject to export or import regulations in other countries. You agree to comply fully with all laws and regulations of the United States and other countries ("Export Laws") to ensure that the Arm Tools are not (i) exported, directly or indirectly, in violation of Export Laws, either to any countries that are subject to U.S. export restrictions or to any end user who has been prohibited from participating in the U.S export transactions by any federal agency of the U.S. government; or (ii) intended to be used for any purpose prohibited by Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation.
 
-Arm Document Reference LES-PRE-21260, Version 12.2, Effective Date 12 February 2019
diff --git a/meta-arm-toolchain/custom-licenses/Armcompiler-Redistributables b/meta-arm-toolchain/custom-licenses/Armcompiler-Redistributables
index aa2070be..75cf9372 100644
--- a/meta-arm-toolchain/custom-licenses/Armcompiler-Redistributables
+++ b/meta-arm-toolchain/custom-licenses/Armcompiler-Redistributables
@@ -1,19 +1,19 @@ 
 ===============================================================================
-This file lists the portions of this release of 'Arm Compiler 6' that you are
-permitted to redistribute and any terms and conditions applicable to such
-redistribution. Refer to the End User License Agreement that accompanies this
-release of 'Arm Compiler 6' for terms and conditions relating to permitted
-redistribution and 'Redistributables'. Any modification or redistribution of
-files covered by open-source licenses, whether listed here or not, is subject
-to the terms of the applicable open-source license.
+This file lists the portions of this release of 'Arm Compiler for Embedded 6'
+that you are permitted to redistribute and any terms and conditions applicable
+to such redistribution. Refer to the End User License Agreement that accompanies
+this release of 'Arm Compiler for Embedded 6' for terms and conditions relating
+to permitted redistribution and 'Redistributables'. Any modification or
+redistribution of files covered by open-source licenses, whether listed here or
+not, is subject to the terms of the applicable open-source license.
 ===============================================================================
 
 1) Target Libraries(libraries and helper libraries): Redistribution permitted
-only in object code form, compiled and linked by Arm Compiler in to Software
-Applications developed by you or your permitted users, provided that Software
-Applications contain substantial additional functionality. If you choose to
-redistribute the whole or any part of Target Libraries, you agree: (a) to
-ensure that they are licensed for use only as part of Software Applications
+only in object code form, compiled and linked by Arm Compiler for Embedded in to
+Software Applications developed by you or your permitted users, provided that
+Software Applications contain substantial additional functionality. If you
+choose to redistribute the whole or any part of Target Libraries, you agree: (a)
+to ensure that they are licensed for use only as part of Software Applications
 and only for execution on microprocessors manufactured or simulated under
 licence from Arm; (b) not to use Arm's or any of its licensors names, logos or
 trademarks to market Software Applications; (c) to include valid copyright
@@ -29,7 +29,7 @@  support libraries; Maths libraries; Software floating-point libraries; VFP
 support found in your installation in armlib and libcxx subdirectories at
 <install_dir>\lib
 
-b) Helper libraries: ARM Compiler 6 helper libraries found in your
+b) Helper libraries: Arm Compiler for Embedded 6 helper libraries found in your
 installation at <install_dir>\lib\armlib\h_*
 
 ---------------------------------------------------------------------
diff --git a/meta-arm-toolchain/custom-licenses/Armcompiler-Supplementary-terms b/meta-arm-toolchain/custom-licenses/Armcompiler-Supplementary-terms
index 3ffc422d..6b828caf 100644
--- a/meta-arm-toolchain/custom-licenses/Armcompiler-Supplementary-terms
+++ b/meta-arm-toolchain/custom-licenses/Armcompiler-Supplementary-terms
@@ -1,10 +1,10 @@ 
 ===============================================================================
 This file contains details of any applicable specific extensions, limitations
 or other variations to the terms of the End User License Agreement that
-accompanies this release of 'Arm Compiler 6'.
+accompanies this release of 'Arm Compiler for Embedded 6'.
 ===============================================================================
 
 There are no 'Supplementary Terms' applicable to this release of
-'Arm Compiler 6'.
+'Arm Compiler for Embedded 6'.
 ---------------------------------------------------------------------
 END OF FILE: supplementary_terms.txt
diff --git a/meta-arm-toolchain/custom-licenses/Armcompiler-Third-party-licenses b/meta-arm-toolchain/custom-licenses/Armcompiler-Third-party-licenses
index 3a8d2ec6..55b78e5c 100644
--- a/meta-arm-toolchain/custom-licenses/Armcompiler-Third-party-licenses
+++ b/meta-arm-toolchain/custom-licenses/Armcompiler-Third-party-licenses
@@ -1,9 +1,9 @@ 
 ===============================================================================
-This file lists the package level copyright and license information for third 
-party software included in this release of 'Arm Compiler 6'. Refer to the 
-License Agreement (End User License Agreement (EULA)) that accompanies this 
-release of 'Arm Compiler 6' for terms and conditions relating to your use of 
-such third party software.
+This file lists the package level copyright and license information for third
+party software included in this release of 'Arm Compiler for Embedded 6'. Refer
+to the License Agreement (End User License Agreement (EULA)) that accompanies
+this release of 'Arm Compiler for Embedded 6' for terms and conditions relating
+to your use of such third party software.
 
 The information is grouped into two sections. The first section lists out
 details of third party software projects, including names of the applicable
@@ -15,7 +15,7 @@  first section.
 SECTION 1: THIRD PARTY SOFTWARE PROJECTS
 ===============================================================================
 
-Name:         Clang #7ff9a93
+Name:         Clang #368af75
 Summary:      C/C++ language frontend for LLVM.
 Home-page:    https://clang.llvm.org/
 License(s):   'Apache License v2.0 with LLVM Exception' and portions with legacy 
@@ -25,7 +25,7 @@  Copyright(s): (For legacy licensed portions) Copyright (c) 2007-2019 University
               of Illinois at Urbana-Champaign. All rights reserved.
               (For portions modified by Arm Limited) Modifications Copyright (C) 
               Arm Limited (or its affiliates). All rights reserved.
-Source(s):    https://github.com/llvm/llvm-project/tree/7ff9a93/clang
+Source(s):    https://github.com/llvm/llvm-project/tree/368af75/clang
 ---------------------------------------------------------------------
 
 Name:         fdlibm (1993)
@@ -36,7 +36,7 @@  License(s):   Custom (MIT like). See later section for a copy of license text.
 Copyright(s): Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
 ---------------------------------------------------------------------
 
-Name:         libc++ #7ff9a93
+Name:         libc++ #368af75
 Summary:      The LLVM implementation of the C++ standard library.
 Home-page:    https://libcxx.llvm.org/
 License(s):   'Apache License v2.0 with LLVM Exception' and portions with legacy 
@@ -48,10 +48,10 @@  Copyright(s): (For legacy licensed portions) Copyright (c) 2009-2019 by the
               Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT.
               (For portions modified by Arm Limited) Modifications Copyright (C) 
               Arm Limited (or its affiliates). All rights reserved.
-Source(s):    https://github.com/llvm/llvm-project/tree/7ff9a93/libcxx
+Source(s):    https://github.com/llvm/llvm-project/tree/368af75/libcxx
 ---------------------------------------------------------------------
 
-Name:         libc++abi #7ff9a93
+Name:         libc++abi #368af75
 Summary:      C++ ABI runtime support library from the LLVM project.
 Home-page:    https://libcxxabi.llvm.org/
 License(s):   'Apache License v2.0 with LLVM Exception' and portions with legacy 
@@ -63,10 +63,10 @@  Copyright(s): (For legacy licensed portions) Copyright (c) 2009-2019 by the
               Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT.
               (For portions modified by Arm Limited) Modifications Copyright (C) 
               Arm Limited (or its affiliates). All rights reserved.
-Source(s):    https://github.com/llvm/llvm-project/tree/7ff9a93/libcxxabi
+Source(s):    https://github.com/llvm/llvm-project/tree/368af75/libcxxabi
 ---------------------------------------------------------------------
 
-Name:         libunwind #7ff9a93
+Name:         libunwind #368af75
 Summary:      C++ exception unwind library from the LLVM project. Library to 
               determine the call-chain of a program..
 Home-page:    https://github.com/llvm-mirror/libunwind
@@ -79,24 +79,28 @@  Copyright(s): (For legacy licensed portions) Copyright (c) 2009-2019 by the
               Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT.
               (For portions modified by Arm Limited) Modifications Copyright (C) 
               Arm Limited (or its affiliates). All rights reserved.
-Source(s):    https://github.com/llvm/llvm-project/tree/7ff9a93/libunwind        
+Source(s):    https://github.com/llvm/llvm-project/tree/368af75/libunwind
+Note:         The included license file refers to CREDITS.TXT in its Copyright
+              statement. However, the provider of libunwind, the LLVM project,
+              has not included the referenced CREDITS.TXT file in the
+              aforementioned source repository.
 ---------------------------------------------------------------------
 
-Name:         libxml2 v2.7.7
+Name:         libxml2 v2.9.9
 Summary:      XML C parsing library.
 Home-page:    http://www.xmlsoft.org/
-License(s):   a) X11 License (X11); AND b) MIT License (MIT). See later section 
+License(s):   a) X11 License (X11); AND b) MIT License (MIT). See later section
               for a copy of license text.
 Copyright(s): Copyright (C) 1998-2003 Daniel Veillard.  All Rights Reserved.
               Copyright (C) 2000 Bjorn Reese and Daniel Veillard.
               Copyright (C) 2000 Gary Pennington and Daniel Veillard.
               Copyright (C) 1998, 2000, 2001 Bjorn Reese and Daniel Stenberg.
               Copyright (C) 2001 Bjorn Reese <breese@users.sourceforge.net>
-              For full list, please refer to Source(s). 
+              For full list, please refer to Source(s).
 Source(s):    ftp://xmlsoft.org/libxml2/
 ---------------------------------------------------------------------
 
-Name:         LLVM #7ff9a93
+Name:         LLVM #368af75
 Summary:      The LLVM Project is a collection of modular and reusable compiler 
               and toolchain technologies. The LLVM Core libraries provide a 
               modern source- and target-independent optimizer, along with code 
@@ -115,12 +119,12 @@  Copyright(s): (For legacy licensed portions) Copyright (c) 2003-2019 University
               Copyright 2001-2004 Unicode, Inc.
               (For portions modified by Arm Limited) Modifications Copyright (C) 
               Arm Limited (or its affiliates). All rights reserved.
-Source(s):    https://github.com/llvm/llvm-project/tree/7ff9a93/llvm
+Source(s):    https://github.com/llvm/llvm-project/tree/368af75/llvm
 ---------------------------------------------------------------------
 
 Name:         glibc v2.12 (Linux OS only)
 Summary:      The GNU C Library. GNU C library (glibc) is dynamically linked to 
-              Arm Compiler for running on Linux Systems.
+              Arm Compiler for Embedded for running on Linux Systems.
 Home-page:    https://www.gnu.org/software/libc/
 License(s):   GNU Lesser General Public License v2.1 or later(LGPL-2.1-or-later)
               See later section for a copy of license text.
@@ -214,28 +218,15 @@  Copyright(s): Copyright (c) 2000, 2004-2007, 2009 Apple Inc. All rights reserved
 Source(s):    https://opensource.apple.com/source/Libc/Libc-1244.50.9/
 ---------------------------------------------------------------------
 
-Name:         libiconv v51.50.1 (Mac OS only)
+Name:         libiconv v1.15
 Summary:      iconv - Unicode character set conversion library.
 Home-page:    https://www.gnu.org/software/libiconv/
 License(s):   GNU Library General Public License v2 or later (LGPL-2.0-or-later)
               See later section for a copy of license text.
-Copyright(s): Copyright (C) 1999-2001 Free Software Foundation, Inc.
-              For full list, please refer to Source(s). 
-Source(s):    
-        https://opensource.apple.com/source/libiconv/libiconv-51.50.1/libiconv/
----------------------------------------------------------------------
-
-Name:         Boost 1.57
-Summary:      Boost C++ libraries
-Home-page:    https://www.boost.org/
-License(s):   Boost Software License 1.0 
-              See later section for a copy of license text.
-Copyright(s): Copyright 1997, 1998, 1999, 2000 University of Notre Dame.
-              Copyright 2002 Indiana University.
-              Copyright 2001 University of Notre Dame.
-              Copyright 2003 Jeremy Siek.
-              For full list, please refer to Source(s). 
-Source(s):    http://sourceforge.net/projects/boost/files/boost/1.57.0/
+Copyright(s): Copyright (C) 1999-2017 Free Software Foundation, Inc.
+              For full list, please refer to Source(s).
+Source(s):
+              https://ftp.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz
 ===============================================================================
 
 SECTION 2: APPLICABLE LICENSES
@@ -3005,8 +2996,8 @@  California, except that body of California law concerning conflicts of law.
 
 Where You are located in the province of Quebec, Canada, the following clause
 applies:  The parties hereby confirm that they have requested that this License
-and all related documents be drafted in English. Les parties ont exig� que le
-pr�sent contrat et tous les documents connexes soient r�dig�s en anglais. 
+and all related documents be drafted in English. Les parties ont exigi?? que le
+pri??sent contrat et tous les documents connexes soient ri??digi??s en anglais. 
 
 EXHIBIT A. 
 
@@ -3916,32 +3907,5 @@  necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-==============================================================================
-
-13) License Text for 'Boost' (Boost Software License 1.0):
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-==============================================================================
+================================================================================
 END OF FILE: third_party_licenses.txt
diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.16.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb
similarity index 89%
rename from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.16.bb
rename to meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb
index e1d5cc38..bbd305bc 100644
--- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.16.bb
+++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb
@@ -21,17 +21,17 @@  LICENSE = "Armcompiler-License-agreement & Armcompiler-Redistributables & \
 LICENSE_FLAGS = "armcompiler"
 
 LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=19faf912b534478d28f60dfa24659c17 \
-                    file://license_terms/redistributables.txt;md5=e510e47f7f5be1356ea6218f5b1f6c55 \
-                    file://license_terms/supplementary_terms.txt;md5=17a2efdbd320ceda48a3521747e02dd9 \
-                    file://license_terms/third_party_licenses.txt;md5=c351a9bed613cf88d4fccd6f0a5e57af "
+                    file://license_terms/redistributables.txt;md5=c22d8d2388d8e592f4b135f87bb243da \
+                    file://license_terms/supplementary_terms.txt;md5=e2443a4a7c520e79ebb603c8ba509076 \
+                    file://license_terms/third_party_licenses.txt;md5=53b42e7d31259bdc174b9c03651ed1b7 "
 
-ARMCLANG_VERSION = "DS500-BN-00026-r5p0-18rel0"
+ARMCLANG_VERSION = "DS500-BN-00026-r5p0-19rel0"
 
 COMPATIBLE_HOST = "x86_64.*-linux"
 
 SRC_URI = "https://developer.arm.com/-/media/Files/downloads/compiler/${ARMCLANG_VERSION}.tgz;subdir=${ARMCLANG_VERSION} \
            file://no-uname.patch"
-SRC_URI[sha256sum] = "d9fb99e7550366f884c31f74953066da64301fb30601cb55278d738459c22557"
+SRC_URI[sha256sum] = "0ed2c3a2e416f07b892250fcbcca4b27353b046a030a433bf6dddc0db802885c"
 
 UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/embedded/arm-compiler/downloads/"
 UPSTREAM_CHECK_REGEX = "Download Arm Compiler.*,(?P<pver>[\d\.]+)"