lib: Integrate abi.h into int_lib.h, there aren't good enough reasons for this extra complexity.
llvm-svn: 144660
diff --git a/compiler-rt/lib/abi.h b/compiler-rt/lib/abi.h
deleted file mode 100644
index 2534317..0000000
--- a/compiler-rt/lib/abi.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ===------ abi.h - configuration header for compiler-rt -----------------===
- *
- * The LLVM Compiler Infrastructure
- *
- * This file is dual licensed under the MIT and the University of Illinois Open
- * Source Licenses. See LICENSE.TXT for details.
- *
- * ===----------------------------------------------------------------------===
- *
- * This file is a configuration header for compiler-rt.
- * This file is not part of the interface of this library.
- *
- * ===----------------------------------------------------------------------===
- */
-
-#if __ARM_EABI__
-# define ARM_EABI_FNALIAS(aeabi_name, name) \
- void __aeabi_##aeabi_name() __attribute__((alias("__" #name)));
-# define COMPILER_RT_ABI __attribute__((pcs("aapcs")))
-#else
-# define ARM_EABI_FNALIAS(aeabi_name, name)
-# define COMPILER_RT_ABI
-#endif
diff --git a/compiler-rt/lib/absvdi2.c b/compiler-rt/lib/absvdi2.c
index 9c5d4a29..09c77b8 100644
--- a/compiler-rt/lib/absvdi2.c
+++ b/compiler-rt/lib/absvdi2.c
@@ -11,7 +11,6 @@
*
*===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/compiler-rt/lib/absvsi2.c b/compiler-rt/lib/absvsi2.c
index 80a1a78..fd7fc40 100644
--- a/compiler-rt/lib/absvsi2.c
+++ b/compiler-rt/lib/absvsi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/compiler-rt/lib/adddf3.c b/compiler-rt/lib/adddf3.c
index 3cc997b..7eb40a1 100644
--- a/compiler-rt/lib/adddf3.c
+++ b/compiler-rt/lib/adddf3.c
@@ -12,8 +12,6 @@
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
-
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/addsf3.c b/compiler-rt/lib/addsf3.c
index 20610ef..e57270a 100644
--- a/compiler-rt/lib/addsf3.c
+++ b/compiler-rt/lib/addsf3.c
@@ -12,8 +12,6 @@
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
-
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/addvdi3.c b/compiler-rt/lib/addvdi3.c
index 51ad397..8df8aab 100644
--- a/compiler-rt/lib/addvdi3.c
+++ b/compiler-rt/lib/addvdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/compiler-rt/lib/addvsi3.c b/compiler-rt/lib/addvsi3.c
index c18f7bd..f8101ea 100644
--- a/compiler-rt/lib/addvsi3.c
+++ b/compiler-rt/lib/addvsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/compiler-rt/lib/ashldi3.c b/compiler-rt/lib/ashldi3.c
index adce4e2..6c558fe 100644
--- a/compiler-rt/lib/ashldi3.c
+++ b/compiler-rt/lib/ashldi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/ashrdi3.c b/compiler-rt/lib/ashrdi3.c
index 03692a3..38ab716 100644
--- a/compiler-rt/lib/ashrdi3.c
+++ b/compiler-rt/lib/ashrdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/clzdi2.c b/compiler-rt/lib/clzdi2.c
index c281945..b9e64da 100644
--- a/compiler-rt/lib/clzdi2.c
+++ b/compiler-rt/lib/clzdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/clzsi2.c b/compiler-rt/lib/clzsi2.c
index d0a6aea..25b8ed2c 100644
--- a/compiler-rt/lib/clzsi2.c
+++ b/compiler-rt/lib/clzsi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/cmpdi2.c b/compiler-rt/lib/cmpdi2.c
index 999c3d2..c2b1f69 100644
--- a/compiler-rt/lib/cmpdi2.c
+++ b/compiler-rt/lib/cmpdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/ctzdi2.c b/compiler-rt/lib/ctzdi2.c
index b3d37d0..db3c6fd 100644
--- a/compiler-rt/lib/ctzdi2.c
+++ b/compiler-rt/lib/ctzdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/ctzsi2.c b/compiler-rt/lib/ctzsi2.c
index 2ff0e5d..c69486e 100644
--- a/compiler-rt/lib/ctzsi2.c
+++ b/compiler-rt/lib/ctzsi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/divdf3.c b/compiler-rt/lib/divdf3.c
index 925abd5..cc034dd 100644
--- a/compiler-rt/lib/divdf3.c
+++ b/compiler-rt/lib/divdf3.c
@@ -15,7 +15,6 @@
// underflow with correct rounding.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/divdi3.c b/compiler-rt/lib/divdi3.c
index d62df56..2c2bcc2 100644
--- a/compiler-rt/lib/divdi3.c
+++ b/compiler-rt/lib/divdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/divmoddi4.c b/compiler-rt/lib/divmoddi4.c
index d3ca745..a2b8714 100644
--- a/compiler-rt/lib/divmoddi4.c
+++ b/compiler-rt/lib/divmoddi4.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/divmodsi4.c b/compiler-rt/lib/divmodsi4.c
index 4dc1978..c7f7b1a 100644
--- a/compiler-rt/lib/divmodsi4.c
+++ b/compiler-rt/lib/divmodsi4.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/divsf3.c b/compiler-rt/lib/divsf3.c
index b733307..a8230e4 100644
--- a/compiler-rt/lib/divsf3.c
+++ b/compiler-rt/lib/divsf3.c
@@ -15,7 +15,6 @@
// underflow with correct rounding.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/divsi3.c b/compiler-rt/lib/divsi3.c
index 01ef274..0d81cb8 100644
--- a/compiler-rt/lib/divsi3.c
+++ b/compiler-rt/lib/divsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/extendsfdf2.c b/compiler-rt/lib/extendsfdf2.c
index c0b628df..a630154 100644
--- a/compiler-rt/lib/extendsfdf2.c
+++ b/compiler-rt/lib/extendsfdf2.c
@@ -41,7 +41,7 @@
#include <stdint.h>
#include <limits.h>
-#include "abi.h"
+#include "int_lib.h"
typedef float src_t;
typedef uint32_t src_rep_t;
diff --git a/compiler-rt/lib/ffsdi2.c b/compiler-rt/lib/ffsdi2.c
index 89f1b7b..a5ac990 100644
--- a/compiler-rt/lib/ffsdi2.c
+++ b/compiler-rt/lib/ffsdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/fixdfdi.c b/compiler-rt/lib/fixdfdi.c
index 85a456d..c6732db 100644
--- a/compiler-rt/lib/fixdfdi.c
+++ b/compiler-rt/lib/fixdfdi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/fixdfsi.c b/compiler-rt/lib/fixdfsi.c
index fbcf147..3d4379e 100644
--- a/compiler-rt/lib/fixdfsi.c
+++ b/compiler-rt/lib/fixdfsi.c
@@ -12,7 +12,6 @@
// conversion is undefined for out of range values in the C standard.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/fixsfdi.c b/compiler-rt/lib/fixsfdi.c
index d80e33e..81ceab0 100644
--- a/compiler-rt/lib/fixsfdi.c
+++ b/compiler-rt/lib/fixsfdi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/fixsfsi.c b/compiler-rt/lib/fixsfsi.c
index 67749a5..f6de609 100644
--- a/compiler-rt/lib/fixsfsi.c
+++ b/compiler-rt/lib/fixsfsi.c
@@ -12,7 +12,6 @@
// conversion is undefined for out of range values in the C standard.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/fixunsdfdi.c b/compiler-rt/lib/fixunsdfdi.c
index d80b84a..c0ff160 100644
--- a/compiler-rt/lib/fixunsdfdi.c
+++ b/compiler-rt/lib/fixunsdfdi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/fixunsdfsi.c b/compiler-rt/lib/fixunsdfsi.c
index ecdfb5d..2ce4999 100644
--- a/compiler-rt/lib/fixunsdfsi.c
+++ b/compiler-rt/lib/fixunsdfsi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/fixunssfdi.c b/compiler-rt/lib/fixunssfdi.c
index 1506420..09078db 100644
--- a/compiler-rt/lib/fixunssfdi.c
+++ b/compiler-rt/lib/fixunssfdi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
/* Returns: convert a to a unsigned long long, rounding toward zero.
diff --git a/compiler-rt/lib/fixunssfsi.c b/compiler-rt/lib/fixunssfsi.c
index dbaa511..d80ed18 100644
--- a/compiler-rt/lib/fixunssfsi.c
+++ b/compiler-rt/lib/fixunssfsi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/floatdidf.c b/compiler-rt/lib/floatdidf.c
index 5ba9526..9580770 100644
--- a/compiler-rt/lib/floatdidf.c
+++ b/compiler-rt/lib/floatdidf.c
@@ -11,7 +11,6 @@
*
*===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <float.h>
diff --git a/compiler-rt/lib/floatdisf.c b/compiler-rt/lib/floatdisf.c
index 4dc13ca..5a213c0 100644
--- a/compiler-rt/lib/floatdisf.c
+++ b/compiler-rt/lib/floatdisf.c
@@ -12,7 +12,6 @@
*===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include <float.h>
/* Returns: convert a to a float, rounding toward even.*/
diff --git a/compiler-rt/lib/floatsidf.c b/compiler-rt/lib/floatsidf.c
index 7227335..74cb66b 100644
--- a/compiler-rt/lib/floatsidf.c
+++ b/compiler-rt/lib/floatsidf.c
@@ -12,7 +12,6 @@
// mode.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/floatsisf.c b/compiler-rt/lib/floatsisf.c
index e5250ff..a981391 100644
--- a/compiler-rt/lib/floatsisf.c
+++ b/compiler-rt/lib/floatsisf.c
@@ -12,7 +12,6 @@
// mode.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/floatundidf.c b/compiler-rt/lib/floatundidf.c
index e74e9d8..5848f8d 100644
--- a/compiler-rt/lib/floatundidf.c
+++ b/compiler-rt/lib/floatundidf.c
@@ -12,7 +12,6 @@
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include <float.h>
/* Returns: convert a to a double, rounding toward even. */
diff --git a/compiler-rt/lib/floatundisf.c b/compiler-rt/lib/floatundisf.c
index eea45a7..9ddafc3 100644
--- a/compiler-rt/lib/floatundisf.c
+++ b/compiler-rt/lib/floatundisf.c
@@ -12,7 +12,6 @@
*===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include <float.h>
/* Returns: convert a to a float, rounding toward even. */
diff --git a/compiler-rt/lib/floatunsidf.c b/compiler-rt/lib/floatunsidf.c
index 3756299..0722248 100644
--- a/compiler-rt/lib/floatunsidf.c
+++ b/compiler-rt/lib/floatunsidf.c
@@ -12,7 +12,6 @@
// mode.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/floatunsisf.c b/compiler-rt/lib/floatunsisf.c
index 14ef103..3dc1cd4 100644
--- a/compiler-rt/lib/floatunsisf.c
+++ b/compiler-rt/lib/floatunsisf.c
@@ -12,7 +12,6 @@
// mode.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/fp_lib.h b/compiler-rt/lib/fp_lib.h
index 6c9455a..de5f17f 100644
--- a/compiler-rt/lib/fp_lib.h
+++ b/compiler-rt/lib/fp_lib.h
@@ -24,6 +24,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <limits.h>
+#include "int_lib.h"
#if defined SINGLE_PRECISION
diff --git a/compiler-rt/lib/int_lib.h b/compiler-rt/lib/int_lib.h
index e1fd6b7..27d01fd 100644
--- a/compiler-rt/lib/int_lib.h
+++ b/compiler-rt/lib/int_lib.h
@@ -16,6 +16,17 @@
#ifndef INT_LIB_H
#define INT_LIB_H
+/* ABI macro definitions */
+
+#if __ARM_EABI__
+# define ARM_EABI_FNALIAS(aeabi_name, name) \
+ void __aeabi_##aeabi_name() __attribute__((alias("__" #name)));
+# define COMPILER_RT_ABI __attribute__((pcs("aapcs")))
+#else
+# define ARM_EABI_FNALIAS(aeabi_name, name)
+# define COMPILER_RT_ABI
+#endif
+
/* Assumption: signed integral is 2's complement */
/* Assumption: right shift of signed negative is arithmetic shift */
diff --git a/compiler-rt/lib/lshrdi3.c b/compiler-rt/lib/lshrdi3.c
index 911edb1..8af3e0c 100644
--- a/compiler-rt/lib/lshrdi3.c
+++ b/compiler-rt/lib/lshrdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/moddi3.c b/compiler-rt/lib/moddi3.c
index af0a808..2f3b9cc 100644
--- a/compiler-rt/lib/moddi3.c
+++ b/compiler-rt/lib/moddi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/modsi3.c b/compiler-rt/lib/modsi3.c
index 05ce806..d16213c 100644
--- a/compiler-rt/lib/modsi3.c
+++ b/compiler-rt/lib/modsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/muldf3.c b/compiler-rt/lib/muldf3.c
index f402cfb..86d72d8 100644
--- a/compiler-rt/lib/muldf3.c
+++ b/compiler-rt/lib/muldf3.c
@@ -11,7 +11,6 @@
// with the IEEE-754 default rounding (to nearest, ties to even).
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/muldi3.c b/compiler-rt/lib/muldi3.c
index e6322bf..3e99630 100644
--- a/compiler-rt/lib/muldi3.c
+++ b/compiler-rt/lib/muldi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/mulsf3.c b/compiler-rt/lib/mulsf3.c
index bf46e14..fce2fd4 100644
--- a/compiler-rt/lib/mulsf3.c
+++ b/compiler-rt/lib/mulsf3.c
@@ -11,7 +11,6 @@
// with the IEEE-754 default rounding (to nearest, ties to even).
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/negdf2.c b/compiler-rt/lib/negdf2.c
index b47f397..b11b480 100644
--- a/compiler-rt/lib/negdf2.c
+++ b/compiler-rt/lib/negdf2.c
@@ -10,7 +10,6 @@
// This file implements double-precision soft-float negation.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/negsf2.c b/compiler-rt/lib/negsf2.c
index 98f9fc0..f8ef2d1 100644
--- a/compiler-rt/lib/negsf2.c
+++ b/compiler-rt/lib/negsf2.c
@@ -10,7 +10,6 @@
// This file implements single-precision soft-float negation.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/negvdi2.c b/compiler-rt/lib/negvdi2.c
index aafaa9d..3ea0030 100644
--- a/compiler-rt/lib/negvdi2.c
+++ b/compiler-rt/lib/negvdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/compiler-rt/lib/negvsi2.c b/compiler-rt/lib/negvsi2.c
index 559ea18..9e441cc 100644
--- a/compiler-rt/lib/negvsi2.c
+++ b/compiler-rt/lib/negvsi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/compiler-rt/lib/paritydi2.c b/compiler-rt/lib/paritydi2.c
index e7bebf6..2ded54c 100644
--- a/compiler-rt/lib/paritydi2.c
+++ b/compiler-rt/lib/paritydi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/paritysi2.c b/compiler-rt/lib/paritysi2.c
index 64d509f..5999846 100644
--- a/compiler-rt/lib/paritysi2.c
+++ b/compiler-rt/lib/paritysi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/popcountdi2.c b/compiler-rt/lib/popcountdi2.c
index 136fc04..5e8a62f 100644
--- a/compiler-rt/lib/popcountdi2.c
+++ b/compiler-rt/lib/popcountdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/popcountsi2.c b/compiler-rt/lib/popcountsi2.c
index bfaa3ff..44544ff 100644
--- a/compiler-rt/lib/popcountsi2.c
+++ b/compiler-rt/lib/popcountsi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/powidf2.c b/compiler-rt/lib/powidf2.c
index 2e211eb..ac13b17 100644
--- a/compiler-rt/lib/powidf2.c
+++ b/compiler-rt/lib/powidf2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/powisf2.c b/compiler-rt/lib/powisf2.c
index e6b43b3..0c400ec 100644
--- a/compiler-rt/lib/powisf2.c
+++ b/compiler-rt/lib/powisf2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/subdf3.c b/compiler-rt/lib/subdf3.c
index 825e3c6..5eb1853 100644
--- a/compiler-rt/lib/subdf3.c
+++ b/compiler-rt/lib/subdf3.c
@@ -11,7 +11,6 @@
// IEEE-754 default rounding (to nearest, ties to even).
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/subsf3.c b/compiler-rt/lib/subsf3.c
index 625376a..351be0e 100644
--- a/compiler-rt/lib/subsf3.c
+++ b/compiler-rt/lib/subsf3.c
@@ -11,7 +11,6 @@
// IEEE-754 default rounding (to nearest, ties to even).
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/compiler-rt/lib/subvdi3.c b/compiler-rt/lib/subvdi3.c
index 36b51ad..bcbee0b 100644
--- a/compiler-rt/lib/subvdi3.c
+++ b/compiler-rt/lib/subvdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/compiler-rt/lib/subvsi3.c b/compiler-rt/lib/subvsi3.c
index 03983f7..88d446e 100644
--- a/compiler-rt/lib/subvsi3.c
+++ b/compiler-rt/lib/subvsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/compiler-rt/lib/truncdfsf2.c b/compiler-rt/lib/truncdfsf2.c
index 1dbf02f..2353b9b 100644
--- a/compiler-rt/lib/truncdfsf2.c
+++ b/compiler-rt/lib/truncdfsf2.c
@@ -41,7 +41,7 @@
#include <limits.h>
#include <stdbool.h>
-#include "abi.h"
+#include "int_lib.h"
typedef double src_t;
typedef uint64_t src_rep_t;
diff --git a/compiler-rt/lib/ucmpdi2.c b/compiler-rt/lib/ucmpdi2.c
index f2d3f99..3242bbf 100644
--- a/compiler-rt/lib/ucmpdi2.c
+++ b/compiler-rt/lib/ucmpdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/udivdi3.c b/compiler-rt/lib/udivdi3.c
index bbd551a..6c0303d 100644
--- a/compiler-rt/lib/udivdi3.c
+++ b/compiler-rt/lib/udivdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/udivmoddi4.c b/compiler-rt/lib/udivmoddi4.c
index dcf186d..73043d4 100644
--- a/compiler-rt/lib/udivmoddi4.c
+++ b/compiler-rt/lib/udivmoddi4.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/udivmodsi4.c b/compiler-rt/lib/udivmodsi4.c
index 2a3ee27..5b49089 100644
--- a/compiler-rt/lib/udivmodsi4.c
+++ b/compiler-rt/lib/udivmodsi4.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/udivsi3.c b/compiler-rt/lib/udivsi3.c
index 721ae89..39ef48b 100644
--- a/compiler-rt/lib/udivsi3.c
+++ b/compiler-rt/lib/udivsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/umoddi3.c b/compiler-rt/lib/umoddi3.c
index 9de1a64..3541ab6 100644
--- a/compiler-rt/lib/umoddi3.c
+++ b/compiler-rt/lib/umoddi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/compiler-rt/lib/umodsi3.c b/compiler-rt/lib/umodsi3.c
index 569b7fc..aae741d 100644
--- a/compiler-rt/lib/umodsi3.c
+++ b/compiler-rt/lib/umodsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
