From 5e543752f17c3c831a5728c745c3fccc990baba1 Mon Sep 17 00:00:00 2001 From: Marcus Shawcroft Date: Tue, 20 Nov 2012 23:06:26 +0000 Subject: aarch64: Don't use K&R C --- ports/ChangeLog.aarch64 | 8 ++++++++ ports/sysdeps/aarch64/fpu/s_fma.c | 5 +---- ports/sysdeps/aarch64/fpu/s_fmin.c | 4 +--- ports/sysdeps/aarch64/fpu/s_frint.x | 3 +-- ports/sysdeps/aarch64/fpu/s_lrint.c | 3 +-- ports/sysdeps/aarch64/fpu/s_lround.c | 3 +-- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'ports') diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64 index 941a5f9012..403223c5ae 100644 --- a/ports/ChangeLog.aarch64 +++ b/ports/ChangeLog.aarch64 @@ -1,3 +1,11 @@ +2012-11-20 Marcus Shawcroft + + * sysdeps/aarch64/fpu/s_fma.c (__CONCATX): Don't use K&R. + * sysdeps/aarch64/fpu/s_fmin.c (__CONCATX): Likewise. + * sysdeps/aarch64/fpu/s_lrint.c (__CONCATX): Likewise. + * sysdeps/aarch64/fpu/s_lround.c (__CONCATX): Likewise. + * sysdeps/aarch64/fpu/s_frint.x (__CONCATX): Likewise. + 2012-11-19 Marcus Shawcroft * sysdeps/aarch64/fpu/s_ceil.c: New file. diff --git a/ports/sysdeps/aarch64/fpu/s_fma.c b/ports/sysdeps/aarch64/fpu/s_fma.c index 7d8bd77aae..7dc70739ac 100644 --- a/ports/sysdeps/aarch64/fpu/s_fma.c +++ b/ports/sysdeps/aarch64/fpu/s_fma.c @@ -34,10 +34,7 @@ #define __CONCATX(a,b) __CONCAT(a,b) TYPE -__CONCATX(__,FUNC) (x, y, z) - TYPE x; - TYPE y; - TYPE z; +__CONCATX(__,FUNC) (TYPE x, TYPE y, TYPE z) { TYPE result; asm ( "fmadd" "\t%" REGS "0, %" REGS "1, %" REGS "2, %" REGS "3" diff --git a/ports/sysdeps/aarch64/fpu/s_fmin.c b/ports/sysdeps/aarch64/fpu/s_fmin.c index 3214aa80b4..63e1596e19 100644 --- a/ports/sysdeps/aarch64/fpu/s_fmin.c +++ b/ports/sysdeps/aarch64/fpu/s_fmin.c @@ -38,9 +38,7 @@ #define __CONCATX(a,b) __CONCAT(a,b) TYPE -__CONCATX(__,FUNC) (x, y) - TYPE x; - TYPE y; +__CONCATX(__,FUNC) (TYPE x, TYPE y) { TYPE result; asm ( INSN "\t%" REGS "0, %" REGS "1, %" REGS "2" diff --git a/ports/sysdeps/aarch64/fpu/s_frint.x b/ports/sysdeps/aarch64/fpu/s_frint.x index b3e21e13c1..3c24031deb 100644 --- a/ports/sysdeps/aarch64/fpu/s_frint.x +++ b/ports/sysdeps/aarch64/fpu/s_frint.x @@ -38,8 +38,7 @@ #define __CONCATX(a,b) __CONCAT(a,b) TYPE -__CONCATX(__,FUNC) (x) - TYPE x; +__CONCATX(__,FUNC) (TYPE x) { TYPE result; asm ( INSN "\t%" REGS "0, %" REGS "1" : diff --git a/ports/sysdeps/aarch64/fpu/s_lrint.c b/ports/sysdeps/aarch64/fpu/s_lrint.c index a5ad1eaebf..945428f414 100644 --- a/ports/sysdeps/aarch64/fpu/s_lrint.c +++ b/ports/sysdeps/aarch64/fpu/s_lrint.c @@ -40,8 +40,7 @@ #define __CONCATX(a,b) __CONCAT(a,b) OTYPE -__CONCATX(__,FUNC) (x) - ITYPE x; +__CONCATX(__,FUNC) (ITYPE x) { OTYPE result; ITYPE temp; diff --git a/ports/sysdeps/aarch64/fpu/s_lround.c b/ports/sysdeps/aarch64/fpu/s_lround.c index ca68bd76b5..472143d619 100644 --- a/ports/sysdeps/aarch64/fpu/s_lround.c +++ b/ports/sysdeps/aarch64/fpu/s_lround.c @@ -40,8 +40,7 @@ #define __CONCATX(a,b) __CONCAT(a,b) OTYPE -__CONCATX(__,FUNC) (x) - ITYPE x; +__CONCATX(__,FUNC) (ITYPE x) { OTYPE result; asm ( "fcvtas" "\t%" OREGS "0, %" IREGS "1" -- cgit 1.4.1