Match function arguments with actual usage. Since neither me nor

the maintainer is very fluent with Fortan, let's assume f2c knows
what it was doing.

3 files changed, 204 insertions, 1 deletions

diff --git a/benchmarks/benchfft/distinfo b/benchmarks/benchfft/distinfo
index a15e6374b42..e317046d699 100644
--- a/benchmarks/benchfft/distinfo
+++ b/benchmarks/benchfft/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/11/05 21:04:36 joerg Exp $
+$NetBSD: distinfo,v 1.6 2005/12/13 17:20:53 joerg Exp $
 
 SHA1 (benchfft-2.0.tar.gz) = b49cbad9d390e54d3afe661d51d3dce7b3d6435e
 RMD160 (benchfft-2.0.tar.gz) = bd9ef45e633b8384c836e32e1e1cee877495bb26
@@ -11,3 +11,5 @@ SHA1 (patch-ab) = 1c1be2e043ea9280f70dddd8082d20e929ea9d49
 SHA1 (patch-ac) = 24a1f01426f7e905f5033202b075786f2a632aa4
 SHA1 (patch-ad) = af0b491821b32d4039dd5bc17613b2a0872d13c0
 SHA1 (patch-ae) = ea3cc3719931d2d99484b5291e878a289565174f
+SHA1 (patch-af) = 001da768806216139c0d261d06ed32f13be51787
+SHA1 (patch-ag) = 10189de7c1557eb5c95b4bc06b2eb270b6d748b8
diff --git a/benchmarks/benchfft/patches/patch-af b/benchmarks/benchfft/patches/patch-af
new file mode 100644
index 00000000000..b0b5be4a0d0
--- /dev/null
+++ b/benchmarks/benchfft/patches/patch-af
@@ -0,0 +1,106 @@
+$NetBSD: patch-af,v 1.3 2005/12/13 17:20:53 joerg Exp $
+
+--- f_source/sciport/ffts.f.orig	2005-12-13 12:44:18.000000000 +0000
++++ f_source/sciport/ffts.f
+@@ -66,8 +66,7 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPSCRFORM(IX,NS,NDIV2,CX,C,CH2)
+ C
+-      COMPLEX CX(1),WYK1,C(NS,2),WYK
+-      REAL CH2(NDIV2,2)
++      COMPLEX CX(1),WYK1,C(NS,2),WYK, CH2(NDIV2,2)
+ C
+       IF (IX .GT. 0) GOTO 50
+       K = NS + 1
+@@ -110,8 +109,7 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPSCROCK2(LS,NS,C,CH,CH2)
+ C
+-      COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS)
+-      REAL CH2(2,NS,LS,2)
++      COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS),CH2(2,NS,LS,2)
+ C
+       IF (LS .GT. NS) GOTO 20
+       DO 200 I=1, LS
+@@ -136,8 +134,7 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPSCROCK3(LS,NS,C,CH,CH2)
+ C
+-      COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS)
+-      REAL CH2(2,NS,LS,2)
++      COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS),CH2(2,NS,LS,2)
+ C
+       IF (LS .GT. NS) GOTO 30
+       DO 600 I=1, LS
+@@ -162,7 +159,8 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPSCRBLE1(NN,WORK)
+ C
+-      REAL WORK(NN,2),TWOPI
++      COMPLEX WORK(NN,2)
++      REAL TWOPI
+       DATA TWOPI /6.28318530717958647692/
+ C
+       N = 2 * NN
+@@ -240,8 +238,7 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPSRTOCK2(LS,NS,C,CH,CH2)
+ C
+-      COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS)
+-      REAL CH2(2,NS,LS,2)
++      COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS),CH2(2,NS,LS,2)
+ C
+       IF (LS .GT. NS) GOTO 20
+       DO 200 I=1, LS
+@@ -280,8 +277,7 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPSRTOCK3(LS,NS,C,CH,CH2)
+ C
+-      COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS)
+-      REAL CH2(2,NS,LS,2)
++      COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS),CH2(2,NS,LS,2)
+ C
+       IF (LS .GT. NS) GOTO 30
+       DO 600 I=1, LS
+@@ -306,7 +302,8 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPSRABLE1(NN,WORK)
+ C
+-      REAL WORK(NN,2),TWOPI
++      COMPLEX WORK(NN,2)
++      REAL TWOPI
+       DATA TWOPI /6.28318530717958647692/
+ C
+       N = 2 * NN
+@@ -323,8 +320,8 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPSRCONV1(N,CY,C,CH)
+ C
+-      COMPLEX CY(1)
+-      REAL CH(N/2,2),P(2,1),C(2,N/2)
++      COMPLEX CY(1),CH(N/2,2),C(2,N/2)
++      REAL P(2,1)
+ C
+       N2 = N/2
+       P(1,1) = (C(1,1) + C(2,1)) * 2
+@@ -350,8 +347,8 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPSRCONV2(N,CY,C,CH)
+ C
+-      COMPLEX CY(1)
+-      REAL CH(N/2,2),P(2,1),C(2,N/2)
++      COMPLEX CY(1),CH(N/2,2),C(2,N/2)
++      REAL P(2,1)
+ C
+       N2 = N/2
+       P(1,1) = (C(1,1) + C(2,1)) * 2
+@@ -519,7 +516,8 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPSCABLE2(NN,WORK)
+ C
+-      REAL WORK(2,NN),TWOPI
++      REAL TWOPI
++      COMPLEX WORK(2,NN)
+       DATA TWOPI /6.28318530717958647692/
+ C
+       N = 2 * NN
diff --git a/benchmarks/benchfft/patches/patch-ag b/benchmarks/benchfft/patches/patch-ag
new file mode 100644
index 00000000000..e5a371811de
--- /dev/null
+++ b/benchmarks/benchfft/patches/patch-ag
@@ -0,0 +1,95 @@
+$NetBSD: patch-ag,v 1.3 2005/12/13 17:20:53 joerg Exp $
+
+--- f_source/sciport/fftd.f.orig	2005-12-13 13:09:28.000000000 +0000
++++ f_source/sciport/fftd.f
+@@ -66,8 +66,7 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPDCRFORM(IX,NS,NDIV2,CX,C,CH2)
+ C
+-      DOUBLE COMPLEX CX(1),WYK1,C(NS,2),WYK
+-      DOUBLE PRECISION CH2(NDIV2,2)
++      DOUBLE COMPLEX CX(1),WYK1,C(NS,2),WYK,CH2(NDIV2,2)
+ C
+       IF (IX .GT. 0) GOTO 50
+       K = NS + 1
+@@ -162,7 +161,8 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPDCRBLE1(NN,WORK)
+ C
+-      DOUBLE PRECISION WORK(NN,2),P2,TWOPI
++      DOUBLE COMPLEX WORK(NN,2)
++      DOUBLE PRECISION P2,TWOPI
+       DATA TWOPI /6.2831853071795864769252867665590057683943388D0/
+ C
+       N = 2 * NN
+@@ -218,7 +218,7 @@ C
+          LS = 2
+          NS = NS/2
+  60        CONTINUE
+-         CALL SPDRTOCK3(LS,NS,CWORK(NN+1),CWORK(1),CWORK(N2))
++         CALL  SPDRTOCK3(LS,NS,CWORK(NN+1),CWORK(1),CWORK(N2))
+       IF (NS .EQ. 1) GOTO 70
+          LS = LS + LS
+          NS = NS/2
+@@ -240,8 +240,7 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPDRTOCK2(LS,NS,C,CH,CH2)
+ C
+-      DOUBLE COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS)
+-      DOUBLE PRECISION CH2(2,NS,LS,2)
++      DOUBLE COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS),CH2(2,NS,LS,2)
+ C
+       IF (LS .GT. NS) GOTO 20
+       DO 200 I=1, LS
+@@ -280,8 +279,7 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPDRTOCK3(LS,NS,C,CH,CH2)
+ C
+-      DOUBLE COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS)
+-      DOUBLE PRECISION CH2(2,NS,LS,2)
++      DOUBLE COMPLEX WYK,C(NS,LS,2),CH(NS,2,LS),CH2(2,NS,LS,2)
+ C
+       IF (LS .GT. NS) GOTO 30
+       DO 600 I=1, LS
+@@ -306,7 +304,8 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPDRABLE1(NN,WORK)
+ C
+-      DOUBLE PRECISION WORK(NN,2),P2,TWOPI
++      DOUBLE COMPLEX WORK(NN,2)
++      DOUBLE PRECISION P2,TWOPI
+       DATA TWOPI /6.2831853071795864769252867665590057683943388D0/
+ C
+       N = 2 * NN
+@@ -323,8 +322,8 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPDRCONV1(N,CY,C,CH)
+ C
+-      DOUBLE COMPLEX CY(1)
+-      DOUBLE PRECISION CH(N/2,2),P(2,1),C(2,N/2)
++      DOUBLE COMPLEX CY(1),CH(N/2,2),C(2,N/2)
++      DOUBLE PRECISION P(2,1)
+       DOUBLE PRECISION X,Y,Z,Z1
+ C
+       N2 = N/2
+@@ -351,8 +350,8 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPDRCONV2(N,CY,C,CH)
+ C
+-      DOUBLE COMPLEX CY(1)
+-      DOUBLE PRECISION CH(N/2,2),P(2,1),C(2,N/2)
++      DOUBLE COMPLEX CY(1),CH(N/2,2),C(2,N/2)
++      DOUBLE PRECISION P(2,1)
+       DOUBLE PRECISION X,Y,Z,Z1
+ C
+       N2 = N/2
+@@ -521,7 +520,8 @@ C                                       
+ C                                                 ************
+       SUBROUTINE SPDCABLE2(NN,WORK)
+ C
+-      DOUBLE PRECISION WORK(2,NN),P2,TWOPI
++      DOUBLE COMPLEX WORK(2,NN)
++      DOUBLE PRECISION P2,TWOPI
+       DATA TWOPI /6.2831853071795864769252867665590057683943388D0/
+ C
+       N = 2 * NN