From f54860ea9624d03dbcf06b5f804159f8d8bc536d Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Fri, 25 Jul 2014 11:01:45 +0200
Subject: [PATCH] ffi.c: Do not include stdlib.h.

	* src/alpha/ffi.c: Do not include stdlib.h.
	(ffi_closure_osf_inner) <default>: Use FFI_ASSERT instead of abort.

From-SVN: r213049
---
 libffi/ChangeLog       | 5 +++++
 libffi/src/alpha/ffi.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index f5fdccb36c4..a2db36614fd 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-21  Uros Bizjak  <ubizjak@gmail.com>
+
+	* src/alpha/ffi.c: Do not include stdlib.h.
+	(ffi_closure_osf_inner) <default>: Use FFI_ASSERT instead of abort.
+
 2014-07-04  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* testsuite/lib/libffi.exp (libffi-dg-runtest): Change interface
diff --git a/libffi/src/alpha/ffi.c b/libffi/src/alpha/ffi.c
index 192f691c4a2..cf0a730afb6 100644
--- a/libffi/src/alpha/ffi.c
+++ b/libffi/src/alpha/ffi.c
@@ -27,7 +27,6 @@
 
 #include <ffi.h>
 #include <ffi_common.h>
-#include <stdlib.h>
 
 /* Force FFI_TYPE_LONGDOUBLE to be different than FFI_TYPE_DOUBLE;
    all further uses in this file will refer to the 128-bit type.  */
@@ -273,7 +272,7 @@ ffi_closure_osf_inner(ffi_closure *closure, void *rvalue, unsigned long *argp)
 	  break;
 
 	default:
-	  abort ();
+	  FFI_ASSERT (0);
 	}
 
       argn += ALIGN(size, FFI_SIZEOF_ARG) / FFI_SIZEOF_ARG;