checksums: refresh vendored blake3

Verbatim drop of the c/ sources upstream 1.8.5

Move vendored-related building into a separate SConscript,
that now picks blake3 sources explicitly by arch.

Author: vassilit

lib/SConscript

@@ -85,35 +85,12 @@ sh_formatter = env.Command(
     'formats/sh.c', ['formats/sh.c.in', 'formats/sh.sh'], build_sh_formatter
 )
 
-blake3 = Glob('checksums/blake3/*.[cS]')
-if not env['HAVE_AVX2']:
-    print('Not compiling blake3 avx2 options')
-    blake3 = [f for f in blake3 if 'avx2' not in f.path]
-    env.Append(CCFLAGS=['-DBLAKE3_NO_AVX2'])
-
-if not env['HAVE_AVX512F'] or not env['HAVE_AVX512VL']:
-    print('Not compiling blake3 avx512 options')
-    blake3 = [f for f in blake3 if 'avx512' not in f.path]
-    env.Append(CCFLAGS=['-DBLAKE3_NO_AVX512'])
-
-if not env['HAVE_SSE4_1']:
-    print('Not compiling blake3 sse41 options')
-    blake3 = [f for f in blake3 if 'sse41' not in f.path]
-    env.Append(CCFLAGS=['-DBLAKE3_NO_SSE41'])
-
-if not env['HAVE_SSE2']:
-    print('Not compiling blake3 sse2 options')
-    blake3 = [f for f in blake3 if 'sse2' not in f.path]
-    env.Append(CCFLAGS=['-DBLAKE3_NO_SSE2'])
+checksums = SConscript('checksums/SConscript', exports='env')
 
 library = env.Library(
     '../rmlint',
-    Glob('*.c')           +
-    Glob('checksums/*.c') +
-    Glob('checksums/xxhash/*.c') +
-    Glob('checksums/blake2/*.c') +
-    blake3 +
-    Glob('checksums/sha3/*.c') +
+    Glob('*.c') +
+    checksums +
     Glob('formats/*.c') +
     Glob('fts/*.c')
 )

lib/checksums/SConscript

@@ -0,0 +1,53 @@
+Import('env')
+
+import platform
+
+
+blake3 = Glob('blake3/*.[cS]')
+blake3_machine = platform.machine().lower()
+
+# Windows-only blake3 assembly files are vendored, ignore them for now.
+blake3 = [f for f in blake3 if '_windows_' not in f.path]
+
+if blake3_machine in ('x86_64', 'amd64'):
+    # remove C intrinsics when we should use the assembly version
+    blake3_intrinsics = (
+        'blake3_sse2.c', 'blake3_sse41.c', 'blake3_avx2.c', 'blake3_avx512.c'
+    )
+    blake3 = [f for f in blake3 if f.name not in blake3_intrinsics]
+else:
+    # the assembly is x86-64-only
+    blake3 = [f for f in blake3 if not f.path.endswith('.S')]
+
+if blake3_machine != 'aarch64':
+    blake3 = [f for f in blake3 if 'neon' not in f.path]
+
+if not env['HAVE_AVX2']:
+    print('Not compiling blake3 avx2 options')
+    blake3 = [f for f in blake3 if 'avx2' not in f.path]
+    env.Append(CCFLAGS=['-DBLAKE3_NO_AVX2'])
+
+if not env['HAVE_AVX512F'] or not env['HAVE_AVX512VL']:
+    print('Not compiling blake3 avx512 options')
+    blake3 = [f for f in blake3 if 'avx512' not in f.path]
+    env.Append(CCFLAGS=['-DBLAKE3_NO_AVX512'])
+
+if not env['HAVE_SSE4_1']:
+    print('Not compiling blake3 sse41 options')
+    blake3 = [f for f in blake3 if 'sse41' not in f.path]
+    env.Append(CCFLAGS=['-DBLAKE3_NO_SSE41'])
+
+if not env['HAVE_SSE2']:
+    print('Not compiling blake3 sse2 options')
+    blake3 = [f for f in blake3 if 'sse2' not in f.path]
+    env.Append(CCFLAGS=['-DBLAKE3_NO_SSE2'])
+
+sources = (
+    Glob('*.c') +
+    Glob('xxhash/*.c') +
+    Glob('blake2/*.c') +
+    blake3 +
+    Glob('sha3/*.c')
+)
+
+Return('sources')

lib/checksums/blake3/LICENSE lib/checksums/blake3/LICENSE_A2lib/checksums/blake3/LICENSE renamed to lib/checksums/blake3/LICENSE_A2

@@ -1,131 +1,3 @@
-This work is released into the public domain with CC0 1.0. Alternatively, it is
-licensed under the Apache License 2.0.
-
--------------------------------------------------------------------------------
-
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.
-
--------------------------------------------------------------------------------
 
                                  Apache License
                            Version 2.0, January 2004