fixup! deps: update zlib to upstream 8bbd6c31

lpinca · Nov 11, 2022 · 9387a8f · 9387a8f
1 parent 435f4de
commit 9387a8f
Showing 1 changed file with 40 additions and 31 deletions.
diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp
@@ -68,8 +68,6 @@
             }],
             ['(target_arch in "ia32 x64" and OS!="ios") or arm_fpu=="neon"', {
               'sources': [
-                'adler32_simd.c',
-                'adler32_simd.h',
                 'contrib/optimizations/chunkcopy.h',
                 'contrib/optimizations/inffast_chunk.c',
                 'contrib/optimizations/inffast_chunk.h',
@@ -88,6 +86,8 @@
                 'DEFLATE_SLIDE_HASH_SSE2'
               ],
               'sources': [
+                'adler32_simd.c',
+                'adler32_simd.h',
                 'crc32_simd.c',
                 'crc32_simd.h',
                 'crc_folding.c'
@@ -104,38 +104,47 @@
               ],
             }],
             ['arm_fpu=="neon"', {
-              'defines': [
-                '__ARM_NEON__',
-                'ADLER32_SIMD_NEON',
-                'INFLATE_CHUNK_SIMD_NEON',
-                'DEFLATE_SLIDE_HASH_NEON'
-              ],
+              'defines': [ '__ARM_NEON__' ],
               'conditions': [
-                ['OS!="ios"', {
-                  'defines': [ 'CRC32_ARMV8_CRC32' ],
-                  'sources': [
-                    'crc32_simd.c',
-                    'crc32_simd.h',
-                  ],
+                ['OS=="win"', {
+                  'defines': [
+                    'ARMV8_OS_WINDOWS',
+                    'DEFLATE_SLIDE_HASH_NEON',
+                    'INFLATE_CHUNK_SIMD_NEON'
+                  ]
+                }, {
                   'conditions': [
-                    ['OS=="android"', {
-                      'defines': [ 'ARMV8_OS_ANDROID' ],
-                    }],
-                    ['OS=="linux"', {
-                      'defines': [ 'ARMV8_OS_LINUX' ],
-                    }],
-                    ['OS=="mac"', {
-                      'defines': [ 'ARMV8_OS_MACOS' ],
-                    }],
-                    ['OS=="win"', {
-                      'defines': [ 'ARMV8_OS_WINDOWS' ],
-                    }],
-                    ['OS!="win" and llvm_version=="0.0"', {
-                      'cflags': [
-                        '-march=armv8-a+aes+crc',
+                    ['OS!="ios"', {
+                      'defines': [
+                        'ADLER32_SIMD_NEON',
+                        'CRC32_ARMV8_CRC32',
+                        'DEFLATE_SLIDE_HASH_NEON',
+                        'INFLATE_CHUNK_SIMD_NEON'
+                      ],
+                      'sources': [
+                        'adler32_simd.c',
+                        'adler32_simd.h',
+                        'crc32_simd.c',
+                        'crc32_simd.h',
+                      ],
+                      'conditions': [
+                        ['OS=="android"', {
+                          'defines': [ 'ARMV8_OS_ANDROID' ],
+                        }],
+                        ['OS=="linux"', {
+                          'defines': [ 'ARMV8_OS_LINUX' ],
+                        }],
+                        ['OS=="mac"', {
+                          'defines': [ 'ARMV8_OS_MACOS' ],
+                        }],
+                        ['llvm_version=="0.0"', {
+                          'cflags': [
+                            '-march=armv8-a+aes+crc',
+                          ],
+                        }],
                       ],
-                    }],
-                  ],
+                    }]
+                  ]
                 }],
                 ['target_arch=="arm64"', {
                   'defines': [ 'INFLATE_CHUNK_READ_64LE' ],