| From ad38da9928b2c46c3be9ffa508cdc273583ed44f Mon Sep 17 00:00:00 2001 |
| From: Lucas Meneghel Rodrigues <lmr@redhat.com> |
| Date: Sat, 17 Apr 2010 16:08:09 -0300 |
| Subject: [PATCH 2/2] Fix CTCS2 build in 64 bit boxes |
| |
| Signed-off-by: Chen Cao <kcao@redhat.com> |
| --- |
| runin/src/pi_fftc6/Makefile | 8 ++-- |
| runin/src/pi_fftc6/Makefile_32bit | 68 +++++++++++++++++++++++++++++++++++++ |
| runin/src/pi_fftc6/Makefile_64bit | 68 ------------------------------------- |
| 3 files changed, 72 insertions(+), 72 deletions(-) |
| create mode 100644 runin/src/pi_fftc6/Makefile_32bit |
| delete mode 100644 runin/src/pi_fftc6/Makefile_64bit |
| |
| diff --git a/runin/src/pi_fftc6/Makefile b/runin/src/pi_fftc6/Makefile |
| index e1166bd..57fe30c 100644 |
| --- a/runin/src/pi_fftc6/Makefile |
| +++ b/runin/src/pi_fftc6/Makefile |
| @@ -1,7 +1,7 @@ |
| # ---- for GNU gcc ---- |
| CC = gcc |
| -OFLAGS_FFT = -O6 -ffast-math |
| -OFLAGS_PI = -O6 -ffast-math -mtune=pentium4 -mfpmath=sse,387 -msse3 |
| +OFLAGS_FFT = -O6 -ffast-math |
| +OFLAGS_PI = -O6 -ffast-math |
| |
| # ---- for SUN WS cc ---- |
| #CC = cc |
| @@ -19,10 +19,10 @@ OFLAGS_PI = -O6 -ffast-math -mtune=pentium4 -mfpmath=sse,387 -msse3 |
| #LFLAGS_TH = -lpthread |
| |
| # ---- use 64-bit size FFT ---- |
| -#CFLAGS_FI = -DUSE_FFT_LONG_INT |
| +CFLAGS_FI = -DUSE_FFT_LONG_INT |
| |
| |
| -CFLAGS = $(CFLAGS_TH) $(CFLAGS_FI) |
| +CFLAGS = $(CFLAGS_TH) $(CFLAGS_FI) -DPI_OUT_LOGFILE |
| LFLAGS = -lm $(LFLAGS_TH) |
| |
| |
| diff --git a/runin/src/pi_fftc6/Makefile_32bit b/runin/src/pi_fftc6/Makefile_32bit |
| new file mode 100644 |
| index 0000000..e1166bd |
| --- /dev/null |
| +++ b/runin/src/pi_fftc6/Makefile_32bit |
| @@ -0,0 +1,68 @@ |
| +# ---- for GNU gcc ---- |
| +CC = gcc |
| +OFLAGS_FFT = -O6 -ffast-math |
| +OFLAGS_PI = -O6 -ffast-math -mtune=pentium4 -mfpmath=sse,387 -msse3 |
| + |
| +# ---- for SUN WS cc ---- |
| +#CC = cc |
| +#OFLAGS_FFT = -fast -xO5 |
| +#OFLAGS_PI = -fast -xO5 |
| + |
| +# ---- for DEC cc ---- |
| +#CC = cc |
| +#OFLAGS_FFT = -fast -O6 |
| +#OFLAGS_PI = -fast -O6 |
| + |
| + |
| +# ---- use POSIX Thread ---- |
| +#CFLAGS_TH = -DUSE_CDFT_PTHREADS |
| +#LFLAGS_TH = -lpthread |
| + |
| +# ---- use 64-bit size FFT ---- |
| +#CFLAGS_FI = -DUSE_FFT_LONG_INT |
| + |
| + |
| +CFLAGS = $(CFLAGS_TH) $(CFLAGS_FI) |
| +LFLAGS = -lm $(LFLAGS_TH) |
| + |
| + |
| +all: pi_ca pi_cs pi_cw dgt_div |
| + |
| + |
| +pi_ca : pi_fftca.o fftsgx.o |
| + $(CC) pi_fftca.o fftsgx.o $(LFLAGS) -o $@ |
| + |
| +pi_cs : pi_fftcs.o fftsg_hx.o |
| + $(CC) pi_fftcs.o fftsg_hx.o $(LFLAGS) -o $@ |
| + |
| +pi_cw : pi_fftcw.o fftsg_hx.o |
| + $(CC) pi_fftcw.o fftsg_hx.o $(LFLAGS) -o $@ |
| + |
| +dgt_div : dgt_div.o |
| + $(CC) dgt_div.o -o $@ |
| + |
| + |
| +pi_fftca.o : pi_fftca.c |
| + $(CC) $(CFLAGS) $(OFLAGS_PI) -c $*.c -o $@ |
| + |
| +pi_fftcs.o : pi_fftcs.c |
| + $(CC) $(CFLAGS) $(OFLAGS_PI) -c $*.c -o $@ |
| + |
| +pi_fftcw.o : pi_fftcw.c |
| + $(CC) $(CFLAGS) $(OFLAGS_PI) -c $*.c -o $@ |
| + |
| + |
| +fftsgx.o : fftsgx.c |
| + $(CC) $(CFLAGS) $(OFLAGS_FFT) -c $*.c -o $@ |
| + |
| +fftsg_hx.o : fftsg_hx.c |
| + $(CC) $(CFLAGS) $(OFLAGS_FFT) -c $*.c -o $@ |
| + |
| + |
| +dgt_div.o : dgt_div.c |
| + $(CC) $(CFLAGS) -O -c $*.c -o $@ |
| + |
| + |
| +clean: |
| + rm -f *.o |
| + |
| diff --git a/runin/src/pi_fftc6/Makefile_64bit b/runin/src/pi_fftc6/Makefile_64bit |
| deleted file mode 100644 |
| index 57fe30c..0000000 |
| --- a/runin/src/pi_fftc6/Makefile_64bit |
| +++ /dev/null |
| @@ -1,68 +0,0 @@ |
| -# ---- for GNU gcc ---- |
| -CC = gcc |
| -OFLAGS_FFT = -O6 -ffast-math |
| -OFLAGS_PI = -O6 -ffast-math |
| - |
| -# ---- for SUN WS cc ---- |
| -#CC = cc |
| -#OFLAGS_FFT = -fast -xO5 |
| -#OFLAGS_PI = -fast -xO5 |
| - |
| -# ---- for DEC cc ---- |
| -#CC = cc |
| -#OFLAGS_FFT = -fast -O6 |
| -#OFLAGS_PI = -fast -O6 |
| - |
| - |
| -# ---- use POSIX Thread ---- |
| -#CFLAGS_TH = -DUSE_CDFT_PTHREADS |
| -#LFLAGS_TH = -lpthread |
| - |
| -# ---- use 64-bit size FFT ---- |
| -CFLAGS_FI = -DUSE_FFT_LONG_INT |
| - |
| - |
| -CFLAGS = $(CFLAGS_TH) $(CFLAGS_FI) -DPI_OUT_LOGFILE |
| -LFLAGS = -lm $(LFLAGS_TH) |
| - |
| - |
| -all: pi_ca pi_cs pi_cw dgt_div |
| - |
| - |
| -pi_ca : pi_fftca.o fftsgx.o |
| - $(CC) pi_fftca.o fftsgx.o $(LFLAGS) -o $@ |
| - |
| -pi_cs : pi_fftcs.o fftsg_hx.o |
| - $(CC) pi_fftcs.o fftsg_hx.o $(LFLAGS) -o $@ |
| - |
| -pi_cw : pi_fftcw.o fftsg_hx.o |
| - $(CC) pi_fftcw.o fftsg_hx.o $(LFLAGS) -o $@ |
| - |
| -dgt_div : dgt_div.o |
| - $(CC) dgt_div.o -o $@ |
| - |
| - |
| -pi_fftca.o : pi_fftca.c |
| - $(CC) $(CFLAGS) $(OFLAGS_PI) -c $*.c -o $@ |
| - |
| -pi_fftcs.o : pi_fftcs.c |
| - $(CC) $(CFLAGS) $(OFLAGS_PI) -c $*.c -o $@ |
| - |
| -pi_fftcw.o : pi_fftcw.c |
| - $(CC) $(CFLAGS) $(OFLAGS_PI) -c $*.c -o $@ |
| - |
| - |
| -fftsgx.o : fftsgx.c |
| - $(CC) $(CFLAGS) $(OFLAGS_FFT) -c $*.c -o $@ |
| - |
| -fftsg_hx.o : fftsg_hx.c |
| - $(CC) $(CFLAGS) $(OFLAGS_FFT) -c $*.c -o $@ |
| - |
| - |
| -dgt_div.o : dgt_div.c |
| - $(CC) $(CFLAGS) -O -c $*.c -o $@ |
| - |
| - |
| -clean: |
| - rm -f *.o |
| - |
| -- |
| 1.6.6.1 |
| |
