m68k: Remove indirection through weak_aliasx

15 files changed, 47 insertions, 51 deletions

diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k
index d609e27040..2bcddc05c2 100644
--- a/ports/ChangeLog.m68k
+++ b/ports/ChangeLog.m68k
@@ -1,3 +1,22 @@
+2012-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* sysdeps/m68k/m680x0/fpu/s_atan.c (weak_aliasx): Remove
+	macro and use weak_alias directly.
+	* sysdeps/m68k/m680x0/fpu/s_ccosh.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_cexp.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_csin.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_csinh.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_expm1.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_frexp.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_lrint.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_modf.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_isinf.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_remquo.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_scalbn.c (strong_aliasx, weak_aliasx):
+	Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_sin.c (weak_aliasx): Likewise.
+	* sysdeps/m68k/m680x0/fpu/s_sincos.c (weak_aliasx): Likewise.
+
 2012-11-18  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sysdeps/unix/sysv/linux/m68k/nptl/sysdep-cancel.h (_DOCARGS_5)
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_atan.c b/ports/sysdeps/m68k/m680x0/fpu/s_atan.c
index a7d8a296b4..c7bba83f30 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_atan.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_atan.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -32,6 +32,4 @@ __CONCATX(__,FUNC) (x)
 {
   return __m81_u(__CONCATX(__,FUNC))(x);
 }
-
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (__CONCATX(__,FUNC), FUNC)
+weak_alias (__CONCATX(__,FUNC), FUNC)
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c b/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c
index b8360853fd..40568208d1 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_ccosh.c
@@ -1,5 +1,5 @@
 /* Complex cosine hyperbole function.  m68k fpu version
-   Copyright (C) 1997, 1999, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
 
@@ -73,5 +73,4 @@ s(__ccosh) (__complex__ float_type x)
 
   return retval;
 }
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (s(__ccosh), s(ccosh))
+weak_alias (s(__ccosh), s(ccosh))
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_cexp.c b/ports/sysdeps/m68k/m680x0/fpu/s_cexp.c
index c2a9f1d22e..83750b6435 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_cexp.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_cexp.c
@@ -1,5 +1,5 @@
 /* Complex exponential function.  m68k fpu version
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
 
@@ -133,5 +133,4 @@ s(__cexp) (__complex__ float_type x)
 
   return retval;
 }
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (s(__cexp), s(cexp))
+weak_alias (s(__cexp), s(cexp))
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_csin.c b/ports/sysdeps/m68k/m680x0/fpu/s_csin.c
index dc468d40e0..fb660867f1 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_csin.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_csin.c
@@ -1,5 +1,5 @@
 /* Complex sine function.  m68k fpu version
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
 
@@ -64,5 +64,4 @@ s(__csin) (__complex__ float_type x)
 
   return retval;
 }
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (s(__csin), s(csin))
+weak_alias (s(__csin), s(csin))
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_csinh.c b/ports/sysdeps/m68k/m680x0/fpu/s_csinh.c
index 29156586e6..ffc2b000c1 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_csinh.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_csinh.c
@@ -1,5 +1,5 @@
 /* Complex sine hyperbole function.  m68k fpu version
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
 
@@ -66,5 +66,4 @@ s(__csinh) (__complex__ float_type x)
 
   return retval;
 }
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (s(__csinh), s(csinh))
+weak_alias (s(__csinh), s(csinh))
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_expm1.c b/ports/sysdeps/m68k/m680x0/fpu/s_expm1.c
index 6dac1cc1a7..37793221aa 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_expm1.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_expm1.c
@@ -38,6 +38,4 @@ CONCATX(__,FUNC) (float_type x)
     __set_errno (ERANGE);
   return __m81_u(CONCATX(__, FUNC)) (x);
 }
-
-#define weak_aliasx(a, b) weak_alias(a, b)
-weak_aliasx (CONCATX(__, FUNC), FUNC)
+weak_alias (CONCATX(__, FUNC), FUNC)
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_frexp.c b/ports/sysdeps/m68k/m680x0/fpu/s_frexp.c
index b4493190fc..df738407a9 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_frexp.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_frexp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -50,6 +50,4 @@ __CONCATX(__,FUNC) (float_type value, int *expptr)
 	 : "0" (value), "dmi" (-iexponent));
   return mantissa;
 }
-
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (__CONCATX(__,FUNC), FUNC)
+weak_alias (__CONCATX(__,FUNC), FUNC)
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_isinf.c b/ports/sysdeps/m68k/m680x0/fpu/s_isinf.c
index ff4d3b2b16..20872da536 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_isinf.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_isinf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -35,5 +35,4 @@ __CONCATX(__,FUNC) (x)
 
 #define hidden_defx(a) hidden_def(a)
 hidden_defx(__CONCATX(__,FUNC))
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (__CONCATX(__,FUNC), FUNC)
+weak_alias (__CONCATX(__,FUNC), FUNC)
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_lrint.c b/ports/sysdeps/m68k/m680x0/fpu/s_lrint.c
index da2ea53bba..443b05cea3 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_lrint.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_lrint.c
@@ -1,6 +1,6 @@
 /* Round argument to nearest integral value according to current rounding
    direction.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
 
@@ -34,6 +34,4 @@ CONCATX(__lrint,suffix) (float_type x)
 {
   return __m81_u(CONCATX(__lrint,suffix)) (x);
 }
-
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (CONCATX(__lrint,suffix), CONCATX(lrint,suffix))
+weak_alias (CONCATX(__lrint,suffix), CONCATX(lrint,suffix))
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_modf.c b/ports/sysdeps/m68k/m680x0/fpu/s_modf.c
index 95bc0ef212..2520431df0 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_modf.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_modf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -50,6 +50,4 @@ s(__modf) (float_type x, float_type *iptr)
     result = x - x_int;
   return result;
 }
-
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx(s(__modf), s(modf))
+weak_alias (s(__modf), s(modf))
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_remquo.c b/ports/sysdeps/m68k/m680x0/fpu/s_remquo.c
index 1395f7e013..0f052224e4 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_remquo.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_remquo.c
@@ -1,5 +1,5 @@
 /* Compute remainder and a congruent to the quotient.  m68k fpu version
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
 
@@ -43,5 +43,4 @@ s(__remquo) (float_type x, float_type y, int *quo)
   *quo = cquo;
   return result;
 }
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (s(__remquo), s(remquo))
+weak_alias (s(__remquo), s(remquo))
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_scalbn.c b/ports/sysdeps/m68k/m680x0/fpu/s_scalbn.c
index 796aeb2b19..ce1b92a22c 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_scalbn.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_scalbn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -45,9 +45,6 @@ __CONCATX(__scalbn,suffix) (x, exp)
 {
   return __m81_u(__CONCATX(__scalbn,suffix))(x, exp);
 }
-
-#define weak_aliasx(a,b) weak_alias(a,b)
-#define strong_aliasx(a,b) strong_alias(a,b)
-weak_aliasx (__CONCATX(__scalbn,suffix), __CONCATX(scalbn,suffix))
-strong_aliasx (__CONCATX(__scalbn,suffix), __CONCATX(__scalbln,suffix))
-weak_aliasx (__CONCATX(__scalbn,suffix), __CONCATX(scalbln,suffix))
+weak_alias (__CONCATX(__scalbn,suffix), __CONCATX(scalbn,suffix))
+strong_alias (__CONCATX(__scalbn,suffix), __CONCATX(__scalbln,suffix))
+weak_alias (__CONCATX(__scalbn,suffix), __CONCATX(scalbln,suffix))
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_sin.c b/ports/sysdeps/m68k/m680x0/fpu/s_sin.c
index 4f9b659462..1ea3dda693 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_sin.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_sin.c
@@ -35,6 +35,4 @@ CONCATX(__,FUNC) (float_type x)
     __set_errno (EDOM);
   return __m81_u(CONCATX(__, FUNC)) (x);
 }
-
-#define weak_aliasx(a, b) weak_alias(a, b)
-weak_aliasx (CONCATX(__, FUNC), FUNC)
+weak_alias (CONCATX(__, FUNC), FUNC)
diff --git a/ports/sysdeps/m68k/m680x0/fpu/s_sincos.c b/ports/sysdeps/m68k/m680x0/fpu/s_sincos.c
index 5e10db231e..f7a40a3704 100644
--- a/ports/sysdeps/m68k/m680x0/fpu/s_sincos.c
+++ b/ports/sysdeps/m68k/m680x0/fpu/s_sincos.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -32,6 +32,4 @@ CONCATX(__,FUNC) (x, sinx, cosx)
 {
   __m81_u(CONCATX(__,FUNC))(x, sinx, cosx);
 }
-
-#define weak_aliasx(a,b) weak_alias(a,b)
-weak_aliasx (CONCATX(__,FUNC), FUNC)
+weak_alias (CONCATX(__,FUNC), FUNC)