aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/abi.h23
-rw-r--r--lib/absvdi2.c1
-rw-r--r--lib/absvsi2.c1
-rw-r--r--lib/adddf3.c2
-rw-r--r--lib/addsf3.c2
-rw-r--r--lib/addvdi3.c1
-rw-r--r--lib/addvsi3.c1
-rw-r--r--lib/ashldi3.c1
-rw-r--r--lib/ashrdi3.c1
-rw-r--r--lib/clzdi2.c1
-rw-r--r--lib/clzsi2.c1
-rw-r--r--lib/cmpdi2.c1
-rw-r--r--lib/ctzdi2.c1
-rw-r--r--lib/ctzsi2.c1
-rw-r--r--lib/divdf3.c1
-rw-r--r--lib/divdi3.c1
-rw-r--r--lib/divmoddi4.c1
-rw-r--r--lib/divmodsi4.c1
-rw-r--r--lib/divsf3.c1
-rw-r--r--lib/divsi3.c1
-rw-r--r--lib/extendsfdf2.c2
-rw-r--r--lib/ffsdi2.c1
-rw-r--r--lib/fixdfdi.c1
-rw-r--r--lib/fixdfsi.c1
-rw-r--r--lib/fixsfdi.c1
-rw-r--r--lib/fixsfsi.c1
-rw-r--r--lib/fixunsdfdi.c1
-rw-r--r--lib/fixunsdfsi.c1
-rw-r--r--lib/fixunssfdi.c1
-rw-r--r--lib/fixunssfsi.c1
-rw-r--r--lib/floatdidf.c1
-rw-r--r--lib/floatdisf.c1
-rw-r--r--lib/floatsidf.c1
-rw-r--r--lib/floatsisf.c1
-rw-r--r--lib/floatundidf.c1
-rw-r--r--lib/floatundisf.c1
-rw-r--r--lib/floatunsidf.c1
-rw-r--r--lib/floatunsisf.c1
-rw-r--r--lib/fp_lib.h1
-rw-r--r--lib/int_lib.h11
-rw-r--r--lib/lshrdi3.c1
-rw-r--r--lib/moddi3.c1
-rw-r--r--lib/modsi3.c1
-rw-r--r--lib/muldf3.c1
-rw-r--r--lib/muldi3.c1
-rw-r--r--lib/mulsf3.c1
-rw-r--r--lib/negdf2.c1
-rw-r--r--lib/negsf2.c1
-rw-r--r--lib/negvdi2.c1
-rw-r--r--lib/negvsi2.c1
-rw-r--r--lib/paritydi2.c1
-rw-r--r--lib/paritysi2.c1
-rw-r--r--lib/popcountdi2.c1
-rw-r--r--lib/popcountsi2.c1
-rw-r--r--lib/powidf2.c1
-rw-r--r--lib/powisf2.c1
-rw-r--r--lib/subdf3.c1
-rw-r--r--lib/subsf3.c1
-rw-r--r--lib/subvdi3.c1
-rw-r--r--lib/subvsi3.c1
-rw-r--r--lib/truncdfsf2.c2
-rw-r--r--lib/ucmpdi2.c1
-rw-r--r--lib/udivdi3.c1
-rw-r--r--lib/udivmoddi4.c1
-rw-r--r--lib/udivmodsi4.c1
-rw-r--r--lib/udivsi3.c1
-rw-r--r--lib/umoddi3.c1
-rw-r--r--lib/umodsi3.c1
68 files changed, 14 insertions, 90 deletions
diff --git a/lib/abi.h b/lib/abi.h
deleted file mode 100644
index 2534317ac..000000000
--- a/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/lib/absvdi2.c b/lib/absvdi2.c
index 9c5d4a299..09c77b8a1 100644
--- a/lib/absvdi2.c
+++ b/lib/absvdi2.c
@@ -11,7 +11,6 @@
*
*===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/lib/absvsi2.c b/lib/absvsi2.c
index 80a1a7898..fd7fc40c3 100644
--- a/lib/absvsi2.c
+++ b/lib/absvsi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/lib/adddf3.c b/lib/adddf3.c
index 3cc997b71..7eb40a15d 100644
--- a/lib/adddf3.c
+++ b/lib/adddf3.c
@@ -12,8 +12,6 @@
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
-
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/lib/addsf3.c b/lib/addsf3.c
index 20610ef31..e57270a1e 100644
--- a/lib/addsf3.c
+++ b/lib/addsf3.c
@@ -12,8 +12,6 @@
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
-
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/lib/addvdi3.c b/lib/addvdi3.c
index 51ad397f5..8df8aabae 100644
--- a/lib/addvdi3.c
+++ b/lib/addvdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/lib/addvsi3.c b/lib/addvsi3.c
index c18f7bd45..f8101eabe 100644
--- a/lib/addvsi3.c
+++ b/lib/addvsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/lib/ashldi3.c b/lib/ashldi3.c
index adce4e2cb..6c558fe65 100644
--- a/lib/ashldi3.c
+++ b/lib/ashldi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/ashrdi3.c b/lib/ashrdi3.c
index 03692a31d..38ab71645 100644
--- a/lib/ashrdi3.c
+++ b/lib/ashrdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/clzdi2.c b/lib/clzdi2.c
index c281945ff..b9e64da49 100644
--- a/lib/clzdi2.c
+++ b/lib/clzdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/clzsi2.c b/lib/clzsi2.c
index d0a6aeabc..25b8ed2c4 100644
--- a/lib/clzsi2.c
+++ b/lib/clzsi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/cmpdi2.c b/lib/cmpdi2.c
index 999c3d2a6..c2b1f69f4 100644
--- a/lib/cmpdi2.c
+++ b/lib/cmpdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/ctzdi2.c b/lib/ctzdi2.c
index b3d37d01b..db3c6fdc0 100644
--- a/lib/ctzdi2.c
+++ b/lib/ctzdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/ctzsi2.c b/lib/ctzsi2.c
index 2ff0e5d76..c69486ea4 100644
--- a/lib/ctzsi2.c
+++ b/lib/ctzsi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/divdf3.c b/lib/divdf3.c
index 925abd509..cc034dd7a 100644
--- a/lib/divdf3.c
+++ b/lib/divdf3.c
@@ -15,7 +15,6 @@
// underflow with correct rounding.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/lib/divdi3.c b/lib/divdi3.c
index d62df56f6..2c2bcc26d 100644
--- a/lib/divdi3.c
+++ b/lib/divdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/divmoddi4.c b/lib/divmoddi4.c
index d3ca745ac..a2b8714b4 100644
--- a/lib/divmoddi4.c
+++ b/lib/divmoddi4.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/divmodsi4.c b/lib/divmodsi4.c
index 4dc197828..c7f7b1a7c 100644
--- a/lib/divmodsi4.c
+++ b/lib/divmodsi4.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/divsf3.c b/lib/divsf3.c
index b73330793..a8230e4a0 100644
--- a/lib/divsf3.c
+++ b/lib/divsf3.c
@@ -15,7 +15,6 @@
// underflow with correct rounding.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/lib/divsi3.c b/lib/divsi3.c
index 01ef27473..0d81cb80c 100644
--- a/lib/divsi3.c
+++ b/lib/divsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/extendsfdf2.c b/lib/extendsfdf2.c
index c0b628dff..a63015430 100644
--- a/lib/extendsfdf2.c
+++ b/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/lib/ffsdi2.c b/lib/ffsdi2.c
index 89f1b7bf4..a5ac9900f 100644
--- a/lib/ffsdi2.c
+++ b/lib/ffsdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/fixdfdi.c b/lib/fixdfdi.c
index 85a456d11..c6732dbbb 100644
--- a/lib/fixdfdi.c
+++ b/lib/fixdfdi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/fixdfsi.c b/lib/fixdfsi.c
index fbcf1470b..3d4379e8f 100644
--- a/lib/fixdfsi.c
+++ b/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/lib/fixsfdi.c b/lib/fixsfdi.c
index d80e33eb7..81ceab024 100644
--- a/lib/fixsfdi.c
+++ b/lib/fixsfdi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/fixsfsi.c b/lib/fixsfsi.c
index 67749a567..f6de60954 100644
--- a/lib/fixsfsi.c
+++ b/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/lib/fixunsdfdi.c b/lib/fixunsdfdi.c
index d80b84a8d..c0ff1606a 100644
--- a/lib/fixunsdfdi.c
+++ b/lib/fixunsdfdi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/fixunsdfsi.c b/lib/fixunsdfsi.c
index ecdfb5d62..2ce499975 100644
--- a/lib/fixunsdfsi.c
+++ b/lib/fixunsdfsi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/fixunssfdi.c b/lib/fixunssfdi.c
index 150642045..09078db2c 100644
--- a/lib/fixunssfdi.c
+++ b/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/lib/fixunssfsi.c b/lib/fixunssfsi.c
index dbaa5115b..d80ed1824 100644
--- a/lib/fixunssfsi.c
+++ b/lib/fixunssfsi.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/floatdidf.c b/lib/floatdidf.c
index 5ba952635..958077032 100644
--- a/lib/floatdidf.c
+++ b/lib/floatdidf.c
@@ -11,7 +11,6 @@
*
*===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <float.h>
diff --git a/lib/floatdisf.c b/lib/floatdisf.c
index 4dc13cab4..5a213c091 100644
--- a/lib/floatdisf.c
+++ b/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/lib/floatsidf.c b/lib/floatsidf.c
index 72273353a..74cb66b2a 100644
--- a/lib/floatsidf.c
+++ b/lib/floatsidf.c
@@ -12,7 +12,6 @@
// mode.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/lib/floatsisf.c b/lib/floatsisf.c
index e5250ffd6..a981391b0 100644
--- a/lib/floatsisf.c
+++ b/lib/floatsisf.c
@@ -12,7 +12,6 @@
// mode.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/lib/floatundidf.c b/lib/floatundidf.c
index e74e9d8d2..5848f8d24 100644
--- a/lib/floatundidf.c
+++ b/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/lib/floatundisf.c b/lib/floatundisf.c
index eea45a745..9ddafc38f 100644
--- a/lib/floatundisf.c
+++ b/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/lib/floatunsidf.c b/lib/floatunsidf.c
index 37562996a..0722248dd 100644
--- a/lib/floatunsidf.c
+++ b/lib/floatunsidf.c
@@ -12,7 +12,6 @@
// mode.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define DOUBLE_PRECISION
#include "fp_lib.h"
diff --git a/lib/floatunsisf.c b/lib/floatunsisf.c
index 14ef10307..3dc1cd442 100644
--- a/lib/floatunsisf.c
+++ b/lib/floatunsisf.c
@@ -12,7 +12,6 @@
// mode.
//
//===----------------------------------------------------------------------===//
-#include "abi.h"
#define SINGLE_PRECISION
#include "fp_lib.h"
diff --git a/lib/fp_lib.h b/lib/fp_lib.h
index 6c9455ace..de5f17fde 100644
--- a/lib/fp_lib.h
+++ b/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/lib/int_lib.h b/lib/int_lib.h
index e1fd6b73d..27d01fdbb 100644
--- a/lib/int_lib.h
+++ b/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/lib/lshrdi3.c b/lib/lshrdi3.c
index 911edb191..8af3e0c1a 100644
--- a/lib/lshrdi3.c
+++ b/lib/lshrdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/moddi3.c b/lib/moddi3.c
index af0a80832..2f3b9cc4f 100644
--- a/lib/moddi3.c
+++ b/lib/moddi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/modsi3.c b/lib/modsi3.c
index 05ce806f7..d16213c49 100644
--- a/lib/modsi3.c
+++ b/lib/modsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/muldf3.c b/lib/muldf3.c
index f402cfb39..86d72d883 100644
--- a/lib/muldf3.c
+++ b/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/lib/muldi3.c b/lib/muldi3.c
index e6322bf5d..3e996302d 100644
--- a/lib/muldi3.c
+++ b/lib/muldi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/mulsf3.c b/lib/mulsf3.c
index bf46e1481..fce2fd4fb 100644
--- a/lib/mulsf3.c
+++ b/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/lib/negdf2.c b/lib/negdf2.c
index b47f3978b..b11b4806c 100644
--- a/lib/negdf2.c
+++ b/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/lib/negsf2.c b/lib/negsf2.c
index 98f9fc0c0..f8ef2d1da 100644
--- a/lib/negsf2.c
+++ b/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/lib/negvdi2.c b/lib/negvdi2.c
index aafaa9dc5..3ea0030ac 100644
--- a/lib/negvdi2.c
+++ b/lib/negvdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/lib/negvsi2.c b/lib/negvsi2.c
index 559ea18e4..9e441ccdb 100644
--- a/lib/negvsi2.c
+++ b/lib/negvsi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/lib/paritydi2.c b/lib/paritydi2.c
index e7bebf685..2ded54c90 100644
--- a/lib/paritydi2.c
+++ b/lib/paritydi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/paritysi2.c b/lib/paritysi2.c
index 64d509fa7..599984663 100644
--- a/lib/paritysi2.c
+++ b/lib/paritysi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/popcountdi2.c b/lib/popcountdi2.c
index 136fc0486..5e8a62f07 100644
--- a/lib/popcountdi2.c
+++ b/lib/popcountdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/popcountsi2.c b/lib/popcountsi2.c
index bfaa3fff2..44544ff49 100644
--- a/lib/popcountsi2.c
+++ b/lib/popcountsi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/powidf2.c b/lib/powidf2.c
index 2e211eb3d..ac13b172b 100644
--- a/lib/powidf2.c
+++ b/lib/powidf2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/powisf2.c b/lib/powisf2.c
index e6b43b3a3..0c400ec6d 100644
--- a/lib/powisf2.c
+++ b/lib/powisf2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/subdf3.c b/lib/subdf3.c
index 825e3c662..5eb1853ef 100644
--- a/lib/subdf3.c
+++ b/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/lib/subsf3.c b/lib/subsf3.c
index 625376acc..351be0ef4 100644
--- a/lib/subsf3.c
+++ b/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/lib/subvdi3.c b/lib/subvdi3.c
index 36b51ad97..bcbee0bbb 100644
--- a/lib/subvdi3.c
+++ b/lib/subvdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/lib/subvsi3.c b/lib/subvsi3.c
index 03983f747..88d446e90 100644
--- a/lib/subvsi3.c
+++ b/lib/subvsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
#include <stdlib.h>
diff --git a/lib/truncdfsf2.c b/lib/truncdfsf2.c
index 1dbf02f5e..2353b9b40 100644
--- a/lib/truncdfsf2.c
+++ b/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/lib/ucmpdi2.c b/lib/ucmpdi2.c
index f2d3f99f8..3242bbf08 100644
--- a/lib/ucmpdi2.c
+++ b/lib/ucmpdi2.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/udivdi3.c b/lib/udivdi3.c
index bbd551ac7..6c0303df3 100644
--- a/lib/udivdi3.c
+++ b/lib/udivdi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/udivmoddi4.c b/lib/udivmoddi4.c
index dcf186df1..73043d421 100644
--- a/lib/udivmoddi4.c
+++ b/lib/udivmoddi4.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/udivmodsi4.c b/lib/udivmodsi4.c
index 2a3ee27f8..5b49089fc 100644
--- a/lib/udivmodsi4.c
+++ b/lib/udivmodsi4.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/udivsi3.c b/lib/udivsi3.c
index 721ae89e4..39ef48bea 100644
--- a/lib/udivsi3.c
+++ b/lib/udivsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/umoddi3.c b/lib/umoddi3.c
index 9de1a64fd..3541ab6e9 100644
--- a/lib/umoddi3.c
+++ b/lib/umoddi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"
diff --git a/lib/umodsi3.c b/lib/umodsi3.c
index 569b7fcb1..aae741d89 100644
--- a/lib/umodsi3.c
+++ b/lib/umodsi3.c
@@ -11,7 +11,6 @@
*
* ===----------------------------------------------------------------------===
*/
-#include "abi.h"
#include "int_lib.h"