diff --git a/LICENSE b/LICENSE index 2543b82ed92d0bdc5f3fdfa5047144db3c7e9014..20a4b7717cf5e46e2def2ecd47756baf3061d2bd 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,11 @@ +MIT OR Apache-2.0 WITH LLVM-exception +===================================== + + MIT License +----------- -Copyright (c) 1999-2019, Arm Limited. +Copyright (c) 1999-2022, Arm Limited. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,3 +24,226 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Apache-2.0 WITH LLVM-exception +------------------------------ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +--- LLVM Exceptions to the Apache 2.0 License ---- + +As an exception, if, as a result of your compiling your source code, portions +of this Software are embedded into an Object form of such source code, you +may redistribute such embedded portions in such Object form without complying +with the conditions of Sections 4(a), 4(b) and 4(d) of the License. + +In addition, if you combine or link compiled forms of this Software with +software that is licensed under the GPLv2 ("Combined Software") and if a +court of competent jurisdiction determines that the patent provision (Section +3), the indemnity provision (Section 9) or other Section of the License +conflicts with the conditions of the GPLv2, you may retroactively and +prospectively choose to deem waived or otherwise exclude such Section(s) of +the License, but only in their entirety and only with respect to the Combined +Software. diff --git a/Makefile b/Makefile index 169f89e2c9d6be3f53a91780447652ee7917b28e..187a72928d44366af3c6559af5a70aaf07e062ec 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Makefile - requires GNU make # # Copyright (c) 2018-2020, Arm Limited. -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception srcdir = . prefix = /usr diff --git a/OAT.xml b/OAT.xml index 71acb93c33930961bd73a8c0eed2ddee84da6bd7..d101fc22d3c62684986ee42855c949b706ec0063 100644 --- a/OAT.xml +++ b/OAT.xml @@ -19,7 +19,7 @@ policylist: 1. policy: If the OAT-Default.xml policies do not meet your requirements, please add policies here. 2. policyitem: The fields type, name, path, desc is required, and the fields rule, group, filefilter is optional,the default value is: - + 3. policyitem type: "compatibility" is used to check license compatibility in the specified path; "license" is used to check source license header in the specified path; @@ -49,10 +49,35 @@ All configurations in this file will be merged to OAT-Default.xml, if you have a + + + + + + + + + + + + + + + + + + + + + + + - + - + + + diff --git a/README b/README index 9e1a34fdc65d9acd27964255a42211af5ef06efa..a2143a28488abe9cbdb629698a3f22d353489b9a 100644 --- a/README +++ b/README @@ -2,14 +2,17 @@ Arm Optimized Routines ---------------------- This repository contains implementations of library functions -provided by Arm under MIT License (See LICENSE). Contributions -to this project are accepted, but Contributors have to sign an -Assignment Agreement, please follow the instructions in +provided by Arm. The outbound license is available under a dual +license, at the user’s election, as reflected in the LICENSE file. +Contributions to this project are accepted, but Contributors have +to sign an Assignment Agreement, please follow the instructions in contributor-agreement.pdf. This is needed so upstreaming code -to projects that require copyright assignment is possible. +to projects that require copyright assignment is possible. Further +contribution requirements are documented in README.contributors of +the appropriate subdirectory. Regular quarterly releases are tagged as vYY.MM, the latest -release is v21.02. +release is v23.01. Source code layout: @@ -24,6 +27,7 @@ networking/test/ - networking test and benchmark related sources. string/ - string routines subproject sources. string/include/ - string library public headers. string/test/ - string test and benchmark related sources. +pl/... - separately maintained performance library code. The steps to build the target libraries and run the tests: diff --git a/README.OpenSource b/README.OpenSource index 0e874ba9c123e151ae6afc3d918443d4986802fc..43689e3b30a2553ef3f4d74c8a718b5813153a90 100644 --- a/README.OpenSource +++ b/README.OpenSource @@ -1,9 +1,9 @@ [ { "Name" : "optimized-routines", - "License" : "MIT License", + "License" : "MIT License OR Apache-2.0 WITH LLVM-exception", "License File" : "LICENSE", - "Version Number" : "v21.02", + "Version Number" : "v23.01", "Owner" : "zhaotianyu9@huawei.com", "Upstream URL" : "https://github.com/ARM-software/optimized-routines", "Description" : "Optimized implementations of various library functions for ARM architecture processors" diff --git a/bundle.json b/bundle.json index 525e1f530a937f92c136418874aad1e76f1af646..98c718d5bf44eb0f66e56e9e428e13b4852a658e 100644 --- a/bundle.json +++ b/bundle.json @@ -2,7 +2,7 @@ "name": "@ohos/optimized_routines", "description": "Optimized implementations of various library functions for ARM architecture processors", "version": "3.1", - "license": "MIT", + "license": "MIT OR Apache-2.0 WITH LLVM-exception", "publishAs": "code-segment", "segment": { "destPath": "third_party/optimized-routines" diff --git a/config.mk.dist b/config.mk.dist index 177e1ac4f53a3e14772a7560f7f79eba86ffe5e7..b33c1070c289959f9c76a3a8aef6b6ab4e33335b 100644 --- a/config.mk.dist +++ b/config.mk.dist @@ -1,7 +1,7 @@ # Example config.mk # # Copyright (c) 2018-2020, Arm Limited. -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception # Subprojects to build SUBS = math string networking diff --git a/networking/Dir.mk b/networking/Dir.mk index b49610341171f43700b2af195fe7b4c7f2402af7..2589e0a1f91c47b76a50bf78e1c7aa01d3ec495f 100644 --- a/networking/Dir.mk +++ b/networking/Dir.mk @@ -1,7 +1,7 @@ # Makefile fragment - requires GNU make # # Copyright (c) 2019-2020, Arm Limited. -# SPDX-License-Identifier: MIT +# SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception S := $(srcdir)/networking B := build/networking diff --git a/networking/aarch64/chksum_simd.c b/networking/aarch64/chksum_simd.c index 6d5be58b1f32d1d49482129a62d7c40e715f9d4f..90c00eb7cabe5a0f3e28b6e8f94c17e9f5750334 100644 --- a/networking/aarch64/chksum_simd.c +++ b/networking/aarch64/chksum_simd.c @@ -2,7 +2,7 @@ * AArch64-specific checksum implementation using NEON * * Copyright (c) 2020, Arm Limited. - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception */ #include "networking.h" diff --git a/networking/arm/chksum_simd.c b/networking/arm/chksum_simd.c index 7f69adfc963c375221bf1d661f2b6f37e5fc56c9..ae08fe5dd0566632cfffdcf245c4d3915884cbd3 100644 --- a/networking/arm/chksum_simd.c +++ b/networking/arm/chksum_simd.c @@ -2,7 +2,7 @@ * Armv7-A specific checksum implementation using NEON * * Copyright (c) 2020, Arm Limited. - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception */ #include "networking.h" diff --git a/networking/chksum.c b/networking/chksum.c index 95ce5baa94e43e9008e2b0750713cf0efb77e7ed..329482ffdcee963b4deed851ce56af0f0748b6b8 100644 --- a/networking/chksum.c +++ b/networking/chksum.c @@ -3,7 +3,7 @@ * This sum is often used as a simple checksum in networking. * * Copyright (c) 2020, Arm Limited. - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception */ #include "networking.h" diff --git a/networking/chksum_common.h b/networking/chksum_common.h index 958c8cc0742e7fb2b58e2bda236f836f69715ee9..16f0f6c11df7015ed0a87e0032685a69c74c154f 100644 --- a/networking/chksum_common.h +++ b/networking/chksum_common.h @@ -2,7 +2,7 @@ * Common code for checksum implementations * * Copyright (c) 2020, Arm Limited. - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception */ #ifndef CHKSUM_COMMON_H diff --git a/networking/include/networking.h b/networking/include/networking.h index a88feff883394ef5c4d7bb840813d5af7f584e90..297dd4bfab0234ceabf663f5e39552b1e08f63ac 100644 --- a/networking/include/networking.h +++ b/networking/include/networking.h @@ -2,7 +2,7 @@ * Public API. * * Copyright (c) 2020, Arm Limited. - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception */ unsigned short __chksum (const void *, unsigned int); diff --git a/networking/test/chksum.c b/networking/test/chksum.c index 41b98120f2758b54b8d13122caffb00224cc3139..239b5b88777be2a4870b4fd65fc29ddadc5ba11a 100644 --- a/networking/test/chksum.c +++ b/networking/test/chksum.c @@ -2,7 +2,7 @@ * Ones' complement checksum test & benchmark * * Copyright (c) 2016-2020, Arm Limited. - * SPDX-License-Identifier: MIT + * SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception */ #define _GNU_SOURCE