Merge branch 'PHP-7.4'

nikic · nikic · commit 62fcb11cbd2d · 2019-10-23T17:42:16.000+02:00
* PHP-7.4:
  Fix aarch64 crc32 implementation
diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c
@@ -86,13 +86,13 @@ PHP_NAMED_FUNCTION(php_if_crc32)
 #if defined(__aarch64__)
 	if (has_crc32_insn()) {
 		crc = crc32_aarch64(crc, p, nr);
-		RETVAL_LONG(crc^0xFFFFFFFF);
+		RETURN_LONG(crc^0xFFFFFFFF);
 	}
 #endif
 
 	for (; nr--; ++p) {
 		crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32tab[(crc ^ (*p)) & 0xFF ];
 	}
-	RETVAL_LONG(crc^0xFFFFFFFF);
+	RETURN_LONG(crc^0xFFFFFFFF);
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,13 @@ PHP_NAMED_FUNCTION(php_if_crc32)`
`86`	`86`	`#if defined(__aarch64__)`
`87`	`87`	`if (has_crc32_insn()) {`
`88`	`88`	`crc = crc32_aarch64(crc, p, nr);`
`89`		`- RETVAL_LONG(crc^0xFFFFFFFF);`
	`89`	`+ RETURN_LONG(crc^0xFFFFFFFF);`
`90`	`90`	`}`
`91`	`91`	`#endif`
`92`	`92`
`93`	`93`	`for (; nr--; ++p) {`
`94`	`94`	`crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32tab[(crc ^ (*p)) & 0xFF ];`
`95`	`95`	`}`
`96`		`- RETVAL_LONG(crc^0xFFFFFFFF);`
	`96`	`+ RETURN_LONG(crc^0xFFFFFFFF);`
`97`	`97`	`}`
`98`	`98`	`/* }}} */`