Merge branch 'x86_64-salsa20-2core'

diff --cc ChangeLog
index d5aaf95f473acb9c166a77bcd69d324b086d727d,100ab82ba1353a1a29e2523b8b26fb3cffc7ed82..0c2d365a31de599bed811b1d71f73e653f232caf
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,9 +1,24 @@@
 +2020-07-13  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * chacha-crypt.c (chacha_crypt) [HAVE_NATIVE_chacha_3core]: Use
 +      _chacha_3core.
 +
 +      * arm/neon/chacha-3core.asm: New file, 3-way interleaving of
 +      chacha.
 +
 +2020-07-11  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * testsuite/chacha-test.c (test_main): Delete obsolete tests for
 +      chacha with 128-bit keys. #if:ed out since 2014-03-04, see below.
 +      (test_chacha_core): New function, test chacha with simple input
 +      structure.
 +
+ 2020-07-10  Niels Möller  <nisse@lysator.liu.se>
+ 
+       * x86_64/salsa20-2core.asm: New file.
+       * x86_64/salsa20-crypt.asm: Deleted, siince the 2core assembly is
+       faster.
+ 
  2020-07-08  Niels Möller  <nisse@lysator.liu.se>
  
        Rearrange salsa20, enabling ARM fat builds to use sala20_2core.