Zend: fix undefined symbol 'execute_ex' on Windows ARM64 Issue#19064 #19068
Conversation
ext/gd: fix emmintrin.h not found on Windows ARM64
hyh19962008
changed the title
|
Nice catch ! we do not have windows arm64 CI. @cmb69 does it look good to you ? |
|
This looks generally good to me, but zend_vm_execute.h needs to be regenerated since zend_vm_execute.h has been changed (see zend_vm_gen.php). I'm not quite sure what to do about gd_interpolation.c; upstream doesn't have these lines, and I think they are superfluous; but it doesn't hurt to apply this patch for now. |
ext/gd/libgd/gd_interpolation.c
Outdated
| @@ -62,7 +62,7 @@ | |||
| #include "gdhelpers.h" | |||
| #include "gd_intern.h" | |||
|
|
|||
| #ifdef _MSC_VER | |||
| #if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) | |||
There was a problem hiding this comment.
We have a matching pragma optimize down below.
Probably, the include should just be dropped?
There was a problem hiding this comment.
The upstream libgd has removed these lines, it might be safe to remove them?
There was a problem hiding this comment.
Ok, I removed them.
|
The pragma optimize at the bottom of the file is now likely also useless; however, upstream also has this and we'd like to be as close to upstream as reasonably possible, so whatever. This is good. |
* PHP-8.4: Update NEWS for GH-19068 ext/gd: Drop useless and doubtful MSVC specific code (libgd/libgd@f1480ab) Zend: fix undefined symbol 'execute_ex' on Windows ARM64 #19064; ext/gd: fix emmintrin.h not found on Windows ARM64
|
Merged, thanks! |
|
I'll cherry-pick your gd change into 8.3 as well. |
ext/gd: fix emmintrin.h not found on Windows ARM64. emmintrin.h is x86 specific.