lib: Integrate abi.h into int_lib.h, there aren't good enough reasons for this extra complexity.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@144660 91177308-0d34-0410-b5e6-96231b3b80d8

68 files changed, 14 insertions, 90 deletions

diff --git a/lib/abi.h b/lib/abi.h
deleted file mode 100644
index 2534317a..00000000
--- 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 9c5d4a29..09c77b8a 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 80a1a789..fd7fc40c 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 3cc997b7..7eb40a15 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 20610ef3..e57270a1 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 51ad397f..8df8aaba 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 c18f7bd4..f8101eab 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 adce4e2c..6c558fe6 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 03692a31..38ab7164 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 c281945f..b9e64da4 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 d0a6aeab..25b8ed2c 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 999c3d2a..c2b1f69f 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 b3d37d01..db3c6fdc 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 2ff0e5d7..c69486ea 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 925abd50..cc034dd7 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 d62df56f..2c2bcc26 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 d3ca745a..a2b8714b 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 4dc19782..c7f7b1a7 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 b7333079..a8230e4a 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 01ef2747..0d81cb80 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 c0b628df..a6301543 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 89f1b7bf..a5ac9900 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 85a456d1..c6732dbb 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 fbcf1470..3d4379e8 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 d80e33eb..81ceab02 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 67749a56..f6de6095 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 d80b84a8..c0ff1606 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 ecdfb5d6..2ce49997 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 15064204..09078db2 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 dbaa5115..d80ed182 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 5ba95263..95807703 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 4dc13cab..5a213c09 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 72273353..74cb66b2 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 e5250ffd..a981391b 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 e74e9d8d..5848f8d2 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 eea45a74..9ddafc38 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 37562996..0722248d 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 14ef1030..3dc1cd44 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 6c9455ac..de5f17fd 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 e1fd6b73..27d01fdb 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 911edb19..8af3e0c1 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 af0a8083..2f3b9cc4 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 05ce806f..d16213c4 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 f402cfb3..86d72d88 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 e6322bf5..3e996302 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 bf46e148..fce2fd4f 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 b47f3978..b11b4806 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 98f9fc0c..f8ef2d1d 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 aafaa9dc..3ea0030a 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 559ea18e..9e441ccd 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 e7bebf68..2ded54c9 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 64d509fa..59998466 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 136fc048..5e8a62f0 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 bfaa3fff..44544ff4 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 2e211eb3..ac13b172 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 e6b43b3a..0c400ec6 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 825e3c66..5eb1853e 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 625376ac..351be0ef 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 36b51ad9..bcbee0bb 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 03983f74..88d446e9 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 1dbf02f5..2353b9b4 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 f2d3f99f..3242bbf0 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 bbd551ac..6c0303df 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 dcf186df..73043d42 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 2a3ee27f..5b49089f 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 721ae89e..39ef48be 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 9de1a64f..3541ab6e 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 569b7fcb..aae741d8 100644
--- a/lib/umodsi3.c
+++ b/lib/umodsi3.c
@@ -11,7 +11,6 @@
  *
  * ===----------------------------------------------------------------------===
  */
-#include "abi.h"
 
 #include "int_lib.h"