Merge pull request #26 from TimNN/arm-cc

powi only: don't override arm calling convention
rust-lang · Nov 10, 2016 · 3bc0272 · 3bc0272
2 parents ecd2b1f + 8250bd0
commit 3bc0272
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/builtins/int_lib.h b/lib/builtins/int_lib.h
@@ -32,7 +32,7 @@
 #if __ARM_EABI__
 # define ARM_EABI_FNALIAS(aeabi_name, name)         \
   void __aeabi_##aeabi_name() __attribute__((alias("__" #name)));
-# define COMPILER_RT_ABI
+# define COMPILER_RT_ABI __attribute__((pcs("aapcs")))
 #else
 # define ARM_EABI_FNALIAS(aeabi_name, name)
 # define COMPILER_RT_ABI

diff --git a/lib/builtins/powidf2.c b/lib/builtins/powidf2.c
@@ -16,7 +16,7 @@
 
 /* Returns: a ^ b */
 
-COMPILER_RT_ABI double
+double
 __powidf2(double a, si_int b)
 {
     const int recip = b < 0;

diff --git a/lib/builtins/powisf2.c b/lib/builtins/powisf2.c
@@ -16,7 +16,7 @@
 
 /* Returns: a ^ b */
 
-COMPILER_RT_ABI float
+float
 __powisf2(float a, si_int b)
 {
     const int recip = b < 0;