Commit c23c60f
zlib: disable CRC32 SIMD optimization
It seems that the optimization causes memory corruption. Disable it
until the issue is fixed upstream.
Fixes: #45268
PR-URL: #49511
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>1 parent ced25a9 commit c23c60f
1 file changed
Lines changed: 30 additions & 28 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -107,33 +107,33 @@ | |||
| 107 | 107 | }], | |
| 108 | 108 | ], | |
| 109 | 109 | }, # zlib_arm_crc32 | |
| 110 | - { | ||
| 111 | - 'target_name': 'zlib_crc32_simd', | ||
| 112 | - 'type': 'static_library', | ||
| 113 | - 'conditions': [ | ||
| 114 | - ['OS!="win" or llvm_version!="0.0"', { | ||
| 115 | - 'cflags': [ | ||
| 116 | - '-msse4.2', | ||
| 117 | - '-mpclmul', | ||
| 118 | - ], | ||
| 119 | - 'xcode_settings': { | ||
| 120 | - 'OTHER_CFLAGS': [ | ||
| 121 | - '-msse4.2', | ||
| 122 | - '-mpclmul', | ||
| 123 | - ], | ||
| 124 | - }, | ||
| 125 | - }] | ||
| 126 | - ], | ||
| 127 | - 'defines': [ 'CRC32_SIMD_SSE42_PCLMUL' ], | ||
| 128 | - 'include_dirs': [ '<(ZLIB_ROOT)' ], | ||
| 129 | - 'direct_dependent_settings': { | ||
| 130 | - 'defines': [ 'CRC32_SIMD_SSE42_PCLMUL' ], | ||
| 131 | - 'include_dirs': [ '<(ZLIB_ROOT)' ], | ||
| 132 | - }, | ||
| 133 | - 'sources': [ | ||
| 134 | - '<!@pymod_do_main(GN-scraper "<(ZLIB_ROOT)/BUILD.gn" "\\"zlib_crc32_simd\\".*?sources = ")', | ||
| 135 | - ], | ||
| 136 | - }, # zlib_crc32_simd | ||
| 110 | + # { | ||
| 111 | + # 'target_name': 'zlib_crc32_simd', | ||
| 112 | + # 'type': 'static_library', | ||
| 113 | + # 'conditions': [ | ||
| 114 | + # ['OS!="win" or llvm_version!="0.0"', { | ||
| 115 | + # 'cflags': [ | ||
| 116 | + # '-msse4.2', | ||
| 117 | + # '-mpclmul', | ||
| 118 | + # ], | ||
| 119 | + # 'xcode_settings': { | ||
| 120 | + # 'OTHER_CFLAGS': [ | ||
| 121 | + # '-msse4.2', | ||
| 122 | + # '-mpclmul', | ||
| 123 | + # ], | ||
| 124 | + # }, | ||
| 125 | + # }] | ||
| 126 | + # ], | ||
| 127 | + # 'defines': [ 'CRC32_SIMD_SSE42_PCLMUL' ], | ||
| 128 | + # 'include_dirs': [ '<(ZLIB_ROOT)' ], | ||
| 129 | + # 'direct_dependent_settings': { | ||
| 130 | + # 'defines': [ 'CRC32_SIMD_SSE42_PCLMUL' ], | ||
| 131 | + # 'include_dirs': [ '<(ZLIB_ROOT)' ], | ||
| 132 | + # }, | ||
| 133 | + # 'sources': [ | ||
| 134 | + # '<!@pymod_do_main(GN-scraper "<(ZLIB_ROOT)/BUILD.gn" "\\"zlib_crc32_simd\\".*?sources = ")', | ||
| 135 | + # ], | ||
| 136 | + # }, # zlib_crc32_simd | ||
| 137 | 137 | { | |
| 138 | 138 | 'target_name': 'zlib_inflate_chunk_simd', | |
| 139 | 139 | 'type': 'static_library', | |
@@ -208,7 +208,9 @@ | |||
| 208 | 208 | ['target_arch in "ia32 x64" and OS!="ios"', { | |
| 209 | 209 | 'dependencies': [ | |
| 210 | 210 | 'zlib_adler32_simd', | |
| 211 | - 'zlib_crc32_simd', | ||
| 211 | + # Disabled due to memory corruption. | ||
| 212 | + # See https://github.com/nodejs/node/issues/45268. | ||
| 213 | + # 'zlib_crc32_simd', | ||
| 212 | 214 | ], | |
| 213 | 215 | 'defines': [ 'DEFLATE_SLIDE_HASH_SSE2' ], | |
| 214 | 216 | 'conditions': [ | |
0 commit comments