--- a/components/libffi/Makefile	Wed Jan 13 09:48:43 2016 -0800
+++ b/components/libffi/Makefile	Wed Jan 13 10:21:51 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 COMPILER =	gcc
@@ -43,6 +43,11 @@
 
 CC +=		$(CC_BITS)
 
+CFLAGS += -DFFI_MMAP_EXEC_WRIT=1
+
+CONFIGURE_OPTIONS += --enable-raw-api=no
+CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
+
 ASLR_MODE = $(ASLR_ENABLE)
 
 configure:	$(CONFIGURE_32_and_64)
@@ -56,3 +61,4 @@
 system-test:    $(NO_TESTS)
 
 REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime