On Mon, 12 Aug 2024 23:15:58 GMT, Kevin Rushforth <k...@openjdk.org> wrote:
> I see one minor difference between the upstream and your PR in a commented > out line of code in `sysv_intel.S`. I don't know whether it is significant (I > guess not, as long as it compiles with the current inline comment style). > > ``` > diff -u -w -r > ../../jfx-tmp/jfx/rt/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/sysv_intel.S > ./src/x86/sysv_intel.S > --- > ../../jfx-tmp/jfx/rt/modules/javafx.media/src/main/native/gstreamer/3rd_party/libffi/src/x86/sysv_intel.S > 2024-08-12 15:59:14.597741100 -0700 > +++ ./src/x86/sysv_intel.S 2024-08-12 16:05:42.708534300 -0700 > @@ -102,7 +102,7 @@ > mov ecx, [12+ebp] /* load return type code */ > mov [ebp+8], ebx /* preserve %ebx */ > L(UW2): > - // cfi_rel_offset(%ebx, 8) > + /* cfi_rel_offset(%ebx, 8) */ > > and ecx, X86_RET_TYPE_MASK > lea ebx, [L(store_table) + ecx * 8] > ``` Yes, it compiles fine. It was changed by libFFI itself in 3.4.6. I think to be inline with rest of comments in this file. ------------- PR Comment: https://git.openjdk.org/jfx/pull/1531#issuecomment-2285153581