ffi 1.11.3 → 1.13.1

data/ext/ffi_c/libffi/src/x86/unix64.S

@@ -42,7 +42,11 @@
 #if defined(__clang__) || defined(__APPLE__) || (defined (__sun__) && defined(__svr4__))
 # define E(BASE, X)	.balign 8
 #else
-# define E(BASE, X)	.balign 8; .org BASE + X * 8
+# ifdef __CET__
+#  define E(BASE, X)	.balign 8; .org BASE + X * 16
+# else
+#  define E(BASE, X)	.balign 8; .org BASE + X * 8
+# endif
 #endif
 
 /* ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags,
@@ -58,6 +62,7 @@
 
 C(ffi_call_unix64):
 L(UW0):
+	_CET_ENDBR
 	movq	(%rsp), %r10		/* Load return address.  */
 	leaq	(%rdi, %rsi), %rax	/* Find local stack base.  */
 	movq	%rdx, (%rax)		/* Save flags.  */
@@ -116,6 +121,11 @@ L(UW2):
 	movzbl	%cl, %r10d
 	leaq	L(store_table)(%rip), %r11
 	ja	L(sa)
+#ifdef __CET__
+	/* NB: Originally, each slot is 8 byte.  4 bytes of ENDBR64 +
+	   4 bytes NOP padding double slot size to 16 bytes.  */
+	addl	%r10d, %r10d
+#endif
 	leaq	(%r11, %r10, 8), %r10
 
 	/* Prep for the structure cases: scratch area in redzone.  */
@@ -125,57 +135,73 @@ L(UW2):
 	.balign	8
 L(store_table):
 E(L(store_table), UNIX64_RET_VOID)
+	_CET_ENDBR
 	ret
 E(L(store_table), UNIX64_RET_UINT8)
+	_CET_ENDBR
 	movzbl	%al, %eax
 	movq	%rax, (%rdi)
 	ret
 E(L(store_table), UNIX64_RET_UINT16)
+	_CET_ENDBR
 	movzwl	%ax, %eax
 	movq	%rax, (%rdi)
 	ret
 E(L(store_table), UNIX64_RET_UINT32)
+	_CET_ENDBR
 	movl	%eax, %eax
 	movq	%rax, (%rdi)
 	ret
 E(L(store_table), UNIX64_RET_SINT8)
+	_CET_ENDBR
 	movsbq	%al, %rax
 	movq	%rax, (%rdi)
 	ret
 E(L(store_table), UNIX64_RET_SINT16)
+	_CET_ENDBR
 	movswq	%ax, %rax
 	movq	%rax, (%rdi)
 	ret
 E(L(store_table), UNIX64_RET_SINT32)
+	_CET_ENDBR
 	cltq
 	movq	%rax, (%rdi)
 	ret
 E(L(store_table), UNIX64_RET_INT64)
+	_CET_ENDBR
 	movq	%rax, (%rdi)
 	ret
 E(L(store_table), UNIX64_RET_XMM32)
+	_CET_ENDBR
 	movd	%xmm0, (%rdi)
 	ret
 E(L(store_table), UNIX64_RET_XMM64)
+	_CET_ENDBR
 	movq	%xmm0, (%rdi)
 	ret
 E(L(store_table), UNIX64_RET_X87)
+	_CET_ENDBR
 	fstpt	(%rdi)
 	ret
 E(L(store_table), UNIX64_RET_X87_2)
+	_CET_ENDBR
 	fstpt	(%rdi)
 	fstpt	16(%rdi)
 	ret
 E(L(store_table), UNIX64_RET_ST_XMM0_RAX)
+	_CET_ENDBR
 	movq	%rax, 8(%rsi)
 	jmp	L(s3)
 E(L(store_table), UNIX64_RET_ST_RAX_XMM0)
+	_CET_ENDBR
 	movq	%xmm0, 8(%rsi)
 	jmp	L(s2)
 E(L(store_table), UNIX64_RET_ST_XMM0_XMM1)
+	_CET_ENDBR
 	movq	%xmm1, 8(%rsi)
 	jmp	L(s3)
 E(L(store_table), UNIX64_RET_ST_RAX_RDX)
+	_CET_ENDBR
 	movq	%rdx, 8(%rsi)
 L(s2):
 	movq	%rax, (%rsi)
@@ -227,6 +253,7 @@ ENDF(C(ffi_call_unix64))
 
 C(ffi_closure_unix64_sse):
 L(UW5):
+	_CET_ENDBR
 	subq	$ffi_closure_FS, %rsp
 L(UW6):
 	/* cfi_adjust_cfa_offset(ffi_closure_FS) */
@@ -250,6 +277,7 @@ ENDF(C(ffi_closure_unix64_sse))
 
 C(ffi_closure_unix64):
 L(UW8):
+	_CET_ENDBR
 	subq	$ffi_closure_FS, %rsp
 L(UW9):
 	/* cfi_adjust_cfa_offset(ffi_closure_FS) */
@@ -286,6 +314,11 @@ L(UW10):
 	movzbl	%al, %r10d
 	leaq	L(load_table)(%rip), %r11
 	ja	L(la)
+#ifdef __CET__
+	/* NB: Originally, each slot is 8 byte.  4 bytes of ENDBR64 +
+	   4 bytes NOP padding double slot size to 16 bytes.  */
+	addl	%r10d, %r10d
+#endif
 	leaq	(%r11, %r10, 8), %r10
 	leaq	ffi_closure_RED_RVALUE(%rsp), %rsi
 	jmp	*%r10
@@ -293,51 +326,67 @@ L(UW10):
 	.balign	8
 L(load_table):
 E(L(load_table), UNIX64_RET_VOID)
+	_CET_ENDBR
 	ret
 E(L(load_table), UNIX64_RET_UINT8)
+	_CET_ENDBR
 	movzbl	(%rsi), %eax
 	ret
 E(L(load_table), UNIX64_RET_UINT16)
+	_CET_ENDBR
 	movzwl	(%rsi), %eax
 	ret
 E(L(load_table), UNIX64_RET_UINT32)
+	_CET_ENDBR
 	movl	(%rsi), %eax
 	ret
 E(L(load_table), UNIX64_RET_SINT8)
+	_CET_ENDBR
 	movsbl	(%rsi), %eax
 	ret
 E(L(load_table), UNIX64_RET_SINT16)
+	_CET_ENDBR
 	movswl	(%rsi), %eax
 	ret
 E(L(load_table), UNIX64_RET_SINT32)
+	_CET_ENDBR
 	movl	(%rsi), %eax
 	ret
 E(L(load_table), UNIX64_RET_INT64)
+	_CET_ENDBR
 	movq	(%rsi), %rax
 	ret
 E(L(load_table), UNIX64_RET_XMM32)
+	_CET_ENDBR
 	movd	(%rsi), %xmm0
 	ret
 E(L(load_table), UNIX64_RET_XMM64)
+	_CET_ENDBR
 	movq	(%rsi), %xmm0
 	ret
 E(L(load_table), UNIX64_RET_X87)
+	_CET_ENDBR
 	fldt	(%rsi)
 	ret
 E(L(load_table), UNIX64_RET_X87_2)
+	_CET_ENDBR
 	fldt	16(%rsi)
 	fldt	(%rsi)
 	ret
 E(L(load_table), UNIX64_RET_ST_XMM0_RAX)
+	_CET_ENDBR
 	movq	8(%rsi), %rax
 	jmp	L(l3)
 E(L(load_table), UNIX64_RET_ST_RAX_XMM0)
+	_CET_ENDBR
 	movq	8(%rsi), %xmm0
 	jmp	L(l2)
 E(L(load_table), UNIX64_RET_ST_XMM0_XMM1)
+	_CET_ENDBR
 	movq	8(%rsi), %xmm1
 	jmp	L(l3)
 E(L(load_table), UNIX64_RET_ST_RAX_RDX)
+	_CET_ENDBR
 	movq	8(%rsi), %rdx
 L(l2):
 	movq	(%rsi), %rax
@@ -358,6 +407,7 @@ ENDF(C(ffi_closure_unix64))
 
 C(ffi_go_closure_unix64_sse):
 L(UW12):
+	_CET_ENDBR
 	subq	$ffi_closure_FS, %rsp
 L(UW13):
 	/* cfi_adjust_cfa_offset(ffi_closure_FS) */
@@ -381,6 +431,7 @@ ENDF(C(ffi_go_closure_unix64_sse))
 
 C(ffi_go_closure_unix64):
 L(UW15):
+	_CET_ENDBR
 	subq	$ffi_closure_FS, %rsp
 L(UW16):
 	/* cfi_adjust_cfa_offset(ffi_closure_FS) */
@@ -424,7 +475,12 @@ EHFrame0:
 #endif
 
 /* Simplify advancing between labels.  Assume DW_CFA_advance_loc1 fits.  */
-#define ADV(N, P)	.byte 2, L(N)-L(P)
+#ifdef __CET__
+/* Use DW_CFA_advance_loc2 when IBT is enabled.  */
+# define ADV(N, P)	.byte 3; .2byte L(N)-L(P)
+#else
+# define ADV(N, P)	.byte 2, L(N)-L(P)
+#endif
 
 	.balign 8
 L(CIE):

data/ext/ffi_c/libffi/src/x86/win64.S

@@ -48,6 +48,7 @@
 	SEH(.seh_proc ffi_call_win64)
 C(ffi_call_win64):
 	cfi_startproc
+	_CET_ENDBR
 	/* Set up the local stack frame and install it in rbp/rsp.  */
 	movq	(%rsp), %rax
 	movq	%rbp, (arg1)
@@ -80,7 +81,7 @@ C(ffi_call_win64):
 	cmpl	$FFI_TYPE_SMALL_STRUCT_4B, %ecx
 	leaq	(%r10, %rcx, 8), %r10
 	ja	99f
-	jmp	*%r10
+	_CET_NOTRACK jmp *%r10
 
 /* Below, we're space constrained most of the time.  Thus we eschew the
    modern "mov, pop, ret" sequence (5 bytes) for "leave, ret" (2 bytes).  */
@@ -176,6 +177,7 @@ E(0b, FFI_TYPE_SMALL_STRUCT_4B)
 	SEH(.seh_proc ffi_go_closure_win64)
 C(ffi_go_closure_win64):
 	cfi_startproc
+	_CET_ENDBR
 	/* Save all integer arguments into the incoming reg stack space.  */
 	movq	%rcx, 8(%rsp)
 	movq	%rdx, 16(%rsp)
@@ -196,6 +198,7 @@ C(ffi_go_closure_win64):
 	SEH(.seh_proc ffi_closure_win64)
 C(ffi_closure_win64):
 	cfi_startproc
+	_CET_ENDBR
 	/* Save all integer arguments into the incoming reg stack space.  */
 	movq	%rcx, 8(%rsp)
 	movq	%rdx, 16(%rsp)

data/ext/ffi_c/libffi/testsuite/Makefile.am

@@ -7,79 +7,28 @@ EXTRA_DEJAGNU_SITE_CONFIG=../local.exp
 CLEANFILES = *.exe core* *.log *.sum
 
 EXTRA_DIST = lib/target-libpath.exp lib/libffi.exp lib/wrapper.exp \
-libffi.call/strlen4.c libffi.call/cls_multi_sshort.c \
-libffi.call/cls_align_longdouble_split2.c libffi.call/cls_1_1byte.c \
-libffi.call/struct10.c libffi.call/cls_uint_va.c \
-libffi.call/many_mixed.c libffi.call/float.c libffi.call/struct5.c \
-libffi.call/return_fl3.c libffi.call/cls_3_1byte.c \
-libffi.call/return_fl1.c libffi.call/cls_many_mixed_args.c \
-libffi.call/cls_20byte1.c libffi.call/cls_pointer_stack.c \
-libffi.call/cls_align_float.c libffi.call/call.exp \
-libffi.call/pyobjc-tc.c libffi.call/float_va.c \
-libffi.call/cls_5_1_byte.c libffi.call/cls_9byte1.c \
-libffi.call/cls_align_uint32.c libffi.call/stret_medium.c \
-libffi.call/cls_3byte1.c libffi.call/cls_align_uint64.c	\
-libffi.call/cls_longdouble_va.c libffi.call/cls_align_pointer.c	\
-libffi.call/cls_19byte.c libffi.call/cls_ushort.c \
-libffi.call/cls_align_sint32.c libffi.call/struct8.c \
-libffi.call/pr1172638.c libffi.call/cls_ulonglong.c \
-libffi.call/cls_struct_va1.c libffi.call/cls_9byte2.c \
-libffi.call/closure_fn5.c libffi.call/cls_5byte.c \
-libffi.call/cls_3float.c libffi.call/return_sc.c \
-libffi.call/cls_schar.c libffi.call/closure_fn4.c \
-libffi.call/cls_uchar_va.c libffi.call/closure_fn0.c \
-libffi.call/huge_struct.c libffi.call/va_struct1.c \
-libffi.call/cls_ushort_va.c libffi.call/struct9.c libffi.call/va_1.c \
-libffi.call/cls_64byte.c libffi.call/va_struct2.c \
-libffi.call/cls_longdouble.c libffi.call/return_fl2.c \
-libffi.call/cls_ulong_va.c libffi.call/cls_6_1_byte.c \
-libffi.call/cls_align_uint16.c libffi.call/closure_fn2.c \
-libffi.call/align_mixed.c libffi.call/unwindtest_ffi_call.cc \
-libffi.call/cls_multi_ushortchar.c libffi.call/cls_8byte.c \
-libffi.call/ffitest.h libffi.call/nested_struct8.c \
-libffi.call/cls_pointer.c libffi.call/nested_struct2.c \
-libffi.call/nested_struct.c libffi.call/struct4.c \
-libffi.call/cls_multi_schar.c \
-libffi.call/cls_align_longdouble_split.c libffi.call/cls_uchar.c \
-libffi.call/return_ldl.c libffi.call/nested_struct9.c \
-libffi.call/cls_float.c libffi.call/stret_medium2.c \
-libffi.call/closure_loc_fn0.c libffi.call/float3.c \
-libffi.call/cls_6byte.c libffi.call/return_sl.c	\
-libffi.call/closure_simple.c libffi.call/return_dbl1.c \
-libffi.call/cls_align_double.c libffi.call/cls_multi_uchar.c \
-libffi.call/err_bad_typedef.c libffi.call/cls_4_1byte.c	\
-libffi.call/closure_fn3.c libffi.call/return_ll1.c \
-libffi.call/return_dbl2.c libffi.call/cls_align_sint64.c \
-libffi.call/nested_struct1.c libffi.call/negint.c \
-libffi.call/nested_struct3.c libffi.call/unwindtest.cc \
+libffi.call/strlen4.c libffi.call/struct10.c libffi.call/many_mixed.c \
+libffi.call/float.c libffi.call/struct5.c libffi.call/return_fl3.c \
+libffi.call/return_fl1.c libffi.call/call.exp libffi.call/pyobjc-tc.c \
+libffi.call/float_va.c libffi.call/struct8.c libffi.call/pr1172638.c \
+libffi.call/return_sc.c libffi.call/va_struct1.c \
+libffi.call/align_stdcall.c libffi.call/struct9.c libffi.call/va_1.c \
+libffi.call/va_struct2.c libffi.call/return_fl2.c \
+libffi.call/align_mixed.c libffi.call/ffitest.h libffi.call/struct4.c \
+libffi.call/return_ldl.c libffi.call/float3.c libffi.call/return_sl.c \
+libffi.call/return_dbl1.c libffi.call/err_bad_typedef.c \
+libffi.call/return_ll1.c libffi.call/return_dbl2.c \
+libffi.call/negint.c libffi.closures/nested_struct3.c \
 libffi.call/struct2.c libffi.call/struct3.c libffi.call/return_fl.c \
-libffi.call/nested_struct5.c libffi.call/cls_multi_ushort.c \
-libffi.call/nested_struct11.c libffi.call/cls_multi_sshortchar.c \
-libffi.call/cls_align_longdouble.c libffi.call/cls_dbls_struct.c \
-libffi.call/cls_many_mixed_float_double.c libffi.call/stret_large.c \
-libffi.call/stret_large2.c libffi.call/cls_align_sint16.c \
-libffi.call/cls_2byte.c libffi.call/offsets.c libffi.call/struct7.c \
-libffi.call/nested_struct4.c libffi.call/problem1.c \
-libffi.call/va_struct3.c libffi.call/testclosure.c \
-libffi.call/float1.c libffi.call/nested_struct6.c \
-libffi.call/cls_4byte.c libffi.call/cls_24byte.c \
-libffi.call/uninitialized.c libffi.call/many2.c	\
-libffi.call/nested_struct10.c libffi.call/struct6.c \
-libffi.call/strlen2.c libffi.call/float2.c libffi.call/cls_uint.c \
-libffi.call/cls_12byte.c libffi.call/return_ul.c \
-libffi.call/cls_sint.c libffi.call/cls_7_1_byte.c \
-libffi.call/struct1.c libffi.call/cls_sshort.c \
-libffi.call/cls_16byte.c libffi.call/strlen3.c \
-libffi.call/nested_struct7.c libffi.call/cls_double_va.c \
-libffi.call/return_dbl.c libffi.call/cls_3byte2.c \
-libffi.call/float4.c libffi.call/cls_double.c libffi.call/many.c \
-libffi.call/cls_7byte.c libffi.call/strlen.c \
-libffi.call/closure_fn6.c libffi.call/return_uc.c \
-libffi.call/closure_fn1.c libffi.call/cls_20byte.c \
-libffi.call/cls_18byte.c libffi.call/err_bad_abi.c \
-libffi.call/many_double.c libffi.call/return_ll.c \
-libffi.call/promotion.c libffi.complex/complex_defs_longdouble.inc \
-libffi.call/align_stdcall.c libffi.complex/cls_align_complex_float.c \
+libffi.call/offsets.c libffi.call/struct7.c libffi.call/va_struct3.c \
+libffi.call/float1.c libffi.call/uninitialized.c libffi.call/many2.c \
+libffi.call/struct6.c libffi.call/strlen2.c libffi.call/float2.c \
+libffi.call/return_ul.c libffi.call/struct1.c libffi.call/strlen3.c \
+libffi.call/return_dbl.c libffi.call/float4.c libffi.call/many.c \
+libffi.call/strlen.c libffi.call/return_uc.c libffi.call/many_double.c \
+libffi.call/return_ll.c libffi.call/promotion.c \
+libffi.complex/complex_defs_longdouble.inc \
+libffi.complex/cls_align_complex_float.c \
 libffi.complex/cls_complex_va_float.c \
 libffi.complex/cls_complex_struct_float.c \
 libffi.complex/return_complex2_longdouble.c \
@@ -90,9 +39,9 @@ libffi.complex/cls_complex_va_longdouble.c \
 libffi.complex/return_complex_double.c \
 libffi.complex/return_complex.inc libffi.complex/many_complex.inc \
 libffi.complex/complex_float.c libffi.complex/cls_align_complex.inc \
-libffi.complex/return_complex2_double.c	\
+libffi.complex/return_complex2_double.c \
 libffi.complex/many_complex_float.c libffi.complex/ffitest.h \
-libffi.complex/return_complex1_double.c	\
+libffi.complex/return_complex1_double.c \
 libffi.complex/cls_complex_struct_longdouble.c \
 libffi.complex/complex_defs_double.inc \
 libffi.complex/cls_complex_va_double.c \
@@ -116,4 +65,58 @@ libffi.go/aa-direct.c libffi.go/ffitest.h libffi.go/go.exp \
 libffi.go/static-chain.h libffi.bhaible/bhaible.exp \
 libffi.bhaible/test-call.c libffi.bhaible/alignof.h \
 libffi.bhaible/testcases.c libffi.bhaible/test-callback.c \
-libffi.bhaible/Makefile libffi.bhaible/README config/default.exp
+libffi.bhaible/Makefile libffi.bhaible/README config/default.exp \
+libffi.closures/cls_multi_sshort.c \
+libffi.closures/cls_align_longdouble_split2.c \
+libffi.closures/cls_1_1byte.c libffi.closures/cls_uint_va.c \
+libffi.closures/cls_3_1byte.c libffi.closures/cls_many_mixed_args.c \
+libffi.closures/cls_20byte1.c libffi.closures/cls_pointer_stack.c \
+libffi.closures/cls_align_float.c libffi.closures/cls_5_1_byte.c \
+libffi.closures/cls_9byte1.c libffi.closures/cls_align_uint32.c \
+libffi.closures/stret_medium.c libffi.closures/cls_3byte1.c \
+libffi.closures/cls_align_uint64.c libffi.closures/cls_longdouble_va.c \
+libffi.closures/cls_align_pointer.c libffi.closures/cls_19byte.c \
+libffi.closures/cls_ushort.c libffi.closures/cls_align_sint32.c \
+libffi.closures/cls_ulonglong.c libffi.closures/cls_struct_va1.c \
+libffi.closures/cls_9byte2.c libffi.closures/closure_fn5.c \
+libffi.closures/cls_5byte.c libffi.closures/cls_3float.c \
+libffi.closures/closure.exp libffi.closures/cls_schar.c \
+libffi.closures/closure_fn4.c libffi.closures/cls_uchar_va.c \
+libffi.closures/closure_fn0.c libffi.closures/huge_struct.c \
+libffi.closures/cls_ushort_va.c \
+libffi.closures/cls_64byte.c libffi.closures/cls_longdouble.c \
+libffi.closures/cls_ulong_va.c libffi.closures/cls_6_1_byte.c \
+libffi.closures/cls_align_uint16.c libffi.closures/closure_fn2.c \
+libffi.closures/unwindtest_ffi_call.cc \
+libffi.closures/cls_multi_ushortchar.c libffi.closures/cls_8byte.c \
+libffi.closures/ffitest.h libffi.closures/nested_struct8.c \
+libffi.closures/cls_pointer.c libffi.closures/nested_struct2.c \
+libffi.closures/nested_struct.c libffi.closures/cls_multi_schar.c \
+libffi.closures/cls_align_longdouble_split.c \
+libffi.closures/cls_uchar.c libffi.closures/nested_struct9.c \
+libffi.closures/cls_float.c libffi.closures/stret_medium2.c \
+libffi.closures/closure_loc_fn0.c libffi.closures/cls_6byte.c \
+libffi.closures/closure_simple.c libffi.closures/cls_align_double.c \
+libffi.closures/cls_multi_uchar.c libffi.closures/cls_4_1byte.c \
+libffi.closures/closure_fn3.c libffi.closures/cls_align_sint64.c \
+libffi.closures/nested_struct1.c libffi.closures/unwindtest.cc \
+libffi.closures/nested_struct5.c libffi.closures/cls_multi_ushort.c \
+libffi.closures/nested_struct11.c \
+libffi.closures/cls_multi_sshortchar.c \
+libffi.closures/cls_align_longdouble.c \
+libffi.closures/cls_dbls_struct.c \
+libffi.closures/cls_many_mixed_float_double.c \
+libffi.closures/stret_large.c libffi.closures/stret_large2.c \
+libffi.closures/cls_align_sint16.c libffi.closures/cls_2byte.c \
+libffi.closures/nested_struct4.c libffi.closures/problem1.c \
+libffi.closures/testclosure.c libffi.closures/nested_struct6.c \
+libffi.closures/cls_4byte.c libffi.closures/cls_24byte.c \
+libffi.closures/nested_struct10.c libffi.closures/cls_uint.c \
+libffi.closures/cls_12byte.c libffi.closures/cls_sint.c \
+libffi.closures/cls_7_1_byte.c libffi.closures/cls_sshort.c \
+libffi.closures/cls_16byte.c libffi.closures/nested_struct7.c \
+libffi.closures/cls_double_va.c libffi.closures/cls_3byte2.c \
+libffi.closures/cls_double.c libffi.closures/cls_7byte.c \
+libffi.closures/closure_fn6.c libffi.closures/closure_fn1.c \
+libffi.closures/cls_20byte.c libffi.closures/cls_18byte.c \
+libffi.closures/err_bad_abi.c

data/ext/ffi_c/libffi/testsuite/lib/libffi.exp

@@ -24,11 +24,6 @@ load_lib libgloss.exp
 load_gcc_lib target-libpath.exp
 load_gcc_lib wrapper.exp
 
-proc check_effective_target_gccbug { } {
-    global has_gccbug
-    return $has_gccbug
-}
-
 # Return 1 if the target matches the effective target 'arg', 0 otherwise.
 # This can be used with any check_* proc that takes no argument and
 # returns only 1 or 0.  It could be used with check_* procs that take
@@ -482,7 +477,6 @@ proc libffi-dg-runtest { testcases default-extra-flags } {
 
 proc run-many-tests { testcases extra_flags } {
     global compiler_vendor
-    global has_gccbug
     global env
     switch $compiler_vendor {
       "clang" {
@@ -498,7 +492,7 @@ proc run-many-tests { testcases extra_flags } {
         if [info exists env(LIBFFI_TEST_OPTIMIZATION)] {
 	  set optimizations [ list $env(LIBFFI_TEST_OPTIMIZATION) ]
         } else { 
-          set optimizations { "-O0" "-O2" "-O2 -fomit-frame-pointer" }
+          set optimizations { "-O0" "-O2" }
         }
       }
       default {
@@ -544,17 +538,6 @@ proc run-many-tests { testcases extra_flags } {
         foreach opt $optimizations {
             foreach abi $abis {
                 set options [concat $common $opt $abi]
-		set has_gccbug false;
-		if { [string match $compiler_vendor "gnu"] \
-			 && [string match "*MSABI*" $abi] \
-			 && ( ( [string match "*DGTEST=57 *" $common] \
-				    && [string match "*call.c*" $testname] ) \
-				  || ( [string match "*DGTEST=54 *" $common] \
-					   && [string match "*callback*" $testname] ) \
-				  || [string match "*DGTEST=55 *" $common] \
-				  || [string match "*DGTEST=56 *" $common] ) } then {
-		    set has_gccbug true;
-		}
                 verbose "Testing $testname, $options" 1
                 dg-test $test $options ""
             }