1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
|
--- mpich-1.2.1/mpid/ch_p4/Makefile.in.orig Wed Aug 16 21:22:39 2000
+++ mpich-1.2.1/mpid/ch_p4/Makefile.in Tue May 29 22:11:11 2001
@@ -31,7 +31,7 @@
# found in, not the directory where the compiler is running (!)
# Trailing / causes problems for some versions of gcc (was -I./)
# Was -I../.. -I../ch_p4
-CFLAGS = @CFLAGS@ -I${top_srcdir}/mpid/ch2 -I${srcdir} -I${top_srcdir}/mpid/util -Ip4 -Ip4/include
+CFLAGS = @CFLAGS@ ${OPTFLAGS} -I${top_srcdir}/mpid/ch2 -I${srcdir} -I${top_srcdir}/mpid/util -Ip4 -Ip4/include
# See mpid/ch_adi2/Makefile.in for a full list
SOURCE = adi2recv.c adi2send.c adi2init.c adi2probe.c adi2ssend.c \
--- mpich-1.2.5/src/env/Makefile.in.orig Tue Sep 5 16:23:17 2000
+++ mpich-1.2.5/src/env/Makefile.in Tue May 29 22:28:29 2001
@@ -116,10 +116,10 @@
# the MPI libraries will work
msgqdllloc.o: ${top_srcdir}/src/env/msgqdllloc.c
@if test -n "@SHAREDKIND_FOR_TV@" -a "@SHAREDKIND_FOR_TV@" != "ignore" ; then \
- ${CC} ${DEFS} ${CFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
+ ${CC} ${DEFS} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c @CC_SHARED_OPT_FOR_TV@ \
-DMPICH_INFODLL_LOC='"@libdir@/libtvmpich.so"' ${top_srcdir}/src/env/msgqdllloc.c ; \
else \
- ${CC} ${DEFS} ${CFLAGS} -c ${top_srcdir}/src/env/msgqdllloc.c ; \
+ ${CC} ${DEFS} ${CFLAGS} ${OPTFLAGSC} ${OPTFLAGS} -c ${top_srcdir}/src/env/msgqdllloc.c ; \
fi
.c.o:
--- mpich-1.2.5/src/infoexport/Makefile.in.orig Fri Jan 14 21:58:04 2000
+++ mpich-1.2.5/src/infoexport/Makefile.in Tue May 29 22:50:47 2001
@@ -7,7 +7,7 @@
# Define FOR_MPI2=1 to enable some MPI-2 support
DEFS = @DEFS@ ${MPIPROFILE} -I. -I${srcdir} @mpich_includes@ -DFOR_MPI2=0
-CFLAGS = -g @CC_SHARED_OPT_FOR_TV@ @CFLAGS@
+CFLAGS = @OPTFLAGS@ @CC_SHARED_OPT_FOR_TV@ @CFLAGS@
@VPATH@
--- mpich-1.2.1/src/fortran/configure.in.orig Tue Aug 29 23:53:00 2000
+++ mpich-1.2.1/src/fortran/configure.in Tue May 29 22:56:52 2001
@@ -21,7 +21,7 @@
AC_SUBST(COPTIONS)
AC_ARG_ENABLE(strict,
[--enable-strict - Turn on strict compilation testing when using gcc],
-COPTIONS="${COPTIONS} -Wall -O -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL")
+COPTIONS="${COPTIONS} -Wall -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL")
AC_ARG_ENABLE(echo,
[--enable-echo - Turn on echoing from within the configure script],
--- mpich-1.2.1/src/fortran/configure.orig Tue Sep 5 22:05:39 2000
+++ mpich-1.2.1/src/fortran/configure Tue May 29 23:16:32 2001
@@ -626,7 +626,7 @@
# Check whether --enable-strict or --disable-strict was given.
if test "${enable_strict+set}" = set; then
enableval="$enable_strict"
- COPTIONS="${COPTIONS} -Wall -O -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL"
+ COPTIONS="${COPTIONS} -Wall -Wstrict-prototypes -Wmissing-prototypes -DGCC_WALL"
fi
--- mpich-1.2.5/configure.in.orig Tue Aug 29 23:52:53 2000
+++ mpich-1.2.5/configure.in Tue May 29 23:05:24 2001
@@ -3075,6 +3075,8 @@
export TESTCC ;\
export TESTF77 ;\
export TESTF90 ;\
+ COPTIONS="$OPTFLAGSC $OPTFLAGS"; export COPTIONS;\
+ FOPTIONS="$OPTFLAGSF $OPTFLAGS"; export FOPTIONS;\
export mpich_includes ;\
export LIB_PATH ;\
export BASE_LIB_LIST ;\
@@ -3193,8 +3193,8 @@
-mpibindir=$binbuild_dir \
-mpilib=$libbuild_dir/lib$MPILIBNAME.a \
-mpiolib=$libbuild_dir/lib$MPILIBNAME.a \
- -cc="$CC" -cflags="$ROMIO_CFLAGS $CC_SHARED_OPT" \
- -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT" \
+ -cc="$CC" -cflags="$ROMIO_CFLAGS $CC_SHARED_OPT $OPTFLAGSC $OPTFLAGS" \
+ -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT $OPTFLAGSF $OPTFLAGS" \
-f90="$F90" $romio_config_args $enable_args $with_args )
/bin/rm -f include/mpio.h ${top_srcdir}/include/mpio.h
cp romio/include/mpio.h include
@@ -3270,6 +3270,7 @@
--prefix=${prefix} $enable_args $with_args \
--libdir=${libdir} --bindir=${bindir} \
--includedir=${includedir} \
+ --with-cflags="$OPTFLAGSC $OPTFLAGS" \
$MPE_ARGS )
if test $? = 0 ; then
echo "Done configuring MPE Profiling Libraries" ; echo
--- mpich-1.2.5/configure.orig Tue Aug 29 23:52:24 2000
+++ mpich-1.2.5/configure Tue May 29 23:09:00 2001
@@ -13517,6 +13517,8 @@
export TESTCC ;\
export TESTF77 ;\
export TESTF90 ;\
+ COPTIONS="$OPTFLAGSC $OPTFLAGS"; export COPTIONS;\
+ FOPTIONS="$OPTFLAGSF $OPTFLAGS"; export FOPTIONS;\
export mpich_includes ;\
export LIB_PATH ;\
export BASE_LIB_LIST ;\
@@ -13723,8 +13723,8 @@
-mpibindir=$binbuild_dir \
-mpilib=$libbuild_dir/lib$MPILIBNAME.a \
-mpiolib=$libbuild_dir/lib$MPILIBNAME.a \
- -cc="$CC" -cflags="$ROMIO_CFLAGS $CC_SHARED_OPT" \
- -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT" \
+ -cc="$CC" -cflags="$ROMIO_CFLAGS $CC_SHARED_OPT $OPTFLAGSC $OPTFLAGS" \
+ -fc="$F77" -fflags="$ROMIO_FFLAGS $FC_SHARED_OPT $OPTFLAGSF $OPTFLAGS" \
-f90="$F90" $romio_config_args $enable_args $with_args )
/bin/rm -f include/mpio.h ${top_srcdir}/include/mpio.h
cp romio/include/mpio.h include
@@ -13800,6 +13800,7 @@
--prefix=${prefix} $enable_args $with_args \
--libdir=${libdir} --bindir=${bindir} \
--includedir=${includedir} \
+ --with-cflags="$OPTFLAGSC $OPTFLAGS" \
$MPE_ARGS )
if test $? = 0 ; then
echo "Done configuring MPE Profiling Libraries" ; echo
--- mpich-1.2.5/Makefile.in.orig Tue Sep 5 22:06:05 2000
+++ mpich-1.2.5/Makefile.in Wed May 30 01:07:43 2001
@@ -327,7 +327,7 @@
CC="@CC@" ; export CC ; \
ldir=`echo $(libdir) | sed -e 's%$(MPIR_HOME)/%%g'` ; \
if ${top_srcdir}/${CPP_DIR}/configure --with-mpich=.. \
- --with-libopt=" " \
+ --with-libopt="@OPTFLAGS@" \
--with-profiling \
--with-mpichbin=${binbuild_dir} \
--with-mpichlib=${libbuild_dir} \
@@ -467,6 +467,7 @@
serv_p4 server:
@if [ ! -d mpid/server ] ; then mkdir mpid/server ; fi
@( cd mpid/server ; rm -f config.cache ; \
+ CFLAGS="@OPTFLAGSC@ @OPTFLAGS@"; export CFLAGS ; \
CC="@CC@" ; export CC ; MAKE="${MAKE}" ; export MAKE ; \
${top_srcdir}/mpid/server/configure ; $(MAKE) serv_p4 ; \
cp serv_p4 $(binbuild_dir) )
--- mpich-1.2.5/mpid/ch_p4/setup_ch_p4.orig Fri Aug 18 21:45:14 2000
+++ mpich-1.2.5/mpid/ch_p4/setup_ch_p4 Wed May 30 05:11:02 2001
@@ -253,6 +253,7 @@
echo "Configuring new p4 secure server"
(cd mpid/server ; \
CC="$CC" ; export CC ; \
+ CFLAGS="$OPTFLAGS"; export CFLAGS ; \
"$top_srcdir/mpid/server/configure" )
if test $? != 0 ; then
print_error "Configure of the secure server may have failed!"
--- mpich-1.2.5/romio/configure.in.orig Mon Jan 13 22:55:57 2003
+++ mpich-1.2.5/romio/configure.in Sat Apr 5 11:05:59 2003
@@ -505,8 +505,8 @@
USER_CFLAGS="$CFLAGS -g"
USER_FFLAGS="$FFLAGS -g"
else
- USER_CFLAGS="$CFLAGS -O"
- USER_FFLAGS="$FFLAGS -O"
+ USER_CFLAGS="$CFLAGS"
+ USER_FFLAGS="$FFLAGS"
fi
#
if test -n "$arch_sun4" ; then
@@ -515,14 +515,14 @@
if test $DEBUG = "yes"; then
if test "$CC" = "gcc"; then
dnl CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
- CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
+ CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
else
dnl CFLAGS="$CFLAGS -g -DAIO_SUN"
CFLAGS="$CFLAGS -g"
fi
else
dnl CFLAGS="$CFLAGS -O -DAIO_SUN"
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
if test "$enable_aio" = "no" ; then
AC_DEFINE(NO_AIO)
@@ -547,14 +547,14 @@
if test $DEBUG = "yes"; then
if test "$CC" = "gcc" ; then
dnl CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DAIO_SUN"
- CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
+ CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
else
dnl CFLAGS="$CFLAGS -g -v -DAIO_SUN"
CFLAGS="$CFLAGS -g -v"
fi
else
dnl CFLAGS="$CFLAGS -O -DAIO_SUN"
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
if test "$enable_aio" = "no" ; then
AC_DEFINE(NO_AIO)
@@ -605,7 +605,7 @@
CFLAGS="$CFLAGS -g"
else
dnl CFLAGS="$CFLAGS -O -DNO_FD_IN_AIOCB -DAIO_HANDLE_IN_AIOCB"
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
# Check that aio is available (many systems appear to have aio
# either installed improperly or turned off).
@@ -661,9 +661,9 @@
CFLAGS="$CFLAGS -g"
else
if test "$CC" = "icc"; then
- CFLAGS="$CFLAGS -Knoieee -Mvect -O3"
+ CFLAGS="$CFLAGS -Knoieee -Mvect"
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
fi
AR="ar860 cr$AR_LOCAL"
@@ -697,9 +697,9 @@
CFLAGS="$CFLAGS -g $TFLOP_FLAGS"
else
if test "$CC" = "pgcc"; then
- CFLAGS="$CFLAGS -Knoieee -Mvect -O3 $TFLOP_FLAGS"
+ CFLAGS="$CFLAGS -Knoieee -Mvect $TFLOP_FLAGS"
else
- CFLAGS="$CFLAGS -O $TFLOP_FLAGS"
+ CFLAGS="$CFLAGS $TFLOP_FLAGS"
fi
fi
AR="xar cr$AR_LOCAL"
@@ -733,14 +733,14 @@
if test $DEBUG = "yes" ; then
if test "$CC" = "gcc" ; then
dnl CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes -DNO_AIO"
- CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
+ CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
else
dnl CFLAGS="$CFLAGS -g -DNO_AIO"
CFLAGS="$CFLAGS -g"
fi
else
dnl CFLAGS="$CFLAGS -O -DNO_AIO"
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
if test "$enable_aio" != "yes" ; then
AC_DEFINE(NO_AIO)
@@ -795,7 +795,7 @@
else
USER_FFLAGS="$FFLAGS -Chopt"
dnl CFLAGS="$CFLAGS -O -DNO_AIO -DSX4"
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
FFLAGS="$FFLAGS -Chopt"
fi
AC_DEFINE(NO_AIO)
@@ -820,7 +820,7 @@
CFLAGS="$CFLAGS -g +w1"
else
dnl CFLAGS="$CFLAGS -O -DNO_AIO"
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
AC_DEFINE(NO_AIO)
RANLIB=":"
@@ -898,7 +898,7 @@
CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose"
else
dnl CFLAGS="$CFLAGS -O -DAIO_PRIORITY_DEFAULT"
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
AC_DEFINE(AIO_PRIORITY_DEFAULT)
MPI_LIB="$MPI_LIB -laio"
@@ -930,7 +930,7 @@
CFLAGS="$CFLAGS -g"
else
dnl CFLAGS="$CFLAGS -O -DNO_AIO"
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
AC_DEFINE(NO_AIO)
RANLIB=":"
@@ -1001,7 +1001,7 @@
if test $DEBUG = "yes"; then
CFLAGS="$CFLAGS -g -fullwarn"
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
if test $osversion = 4 ; then
RANLIB="ar ts"
--- mpich-1.2.5/romio/configure.orig Mon Jan 13 22:55:58 2003
+++ mpich-1.2.5/romio/configure Sat Apr 5 11:06:46 2003
@@ -736,8 +736,8 @@
USER_CFLAGS="$CFLAGS -g"
USER_FFLAGS="$FFLAGS -g"
else
- USER_CFLAGS="$CFLAGS -O"
- USER_FFLAGS="$FFLAGS -O"
+ USER_CFLAGS="$CFLAGS"
+ USER_FFLAGS="$FFLAGS"
fi
#
if test -n "$arch_sun4" ; then
@@ -745,12 +745,12 @@
F77=${FC:-f77}
if test $DEBUG = "yes"; then
if test "$CC" = "gcc"; then
- CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
+ CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
else
CFLAGS="$CFLAGS -g"
fi
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
if test "$enable_aio" = "no" ; then
@@ -796,12 +796,12 @@
F77=${FC:-f77}
if test $DEBUG = "yes"; then
if test "$CC" = "gcc" ; then
- CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
+ CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
else
CFLAGS="$CFLAGS -g -v"
fi
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
if test "$enable_aio" = "no" ; then
@@ -926,7 +926,7 @@
if test $DEBUG = "yes"; then
CFLAGS="$CFLAGS -g"
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
# Check that aio is available (many systems appear to have aio
# either installed improperly or turned off).
@@ -1083,9 +1083,9 @@
CFLAGS="$CFLAGS -g"
else
if test "$CC" = "icc"; then
- CFLAGS="$CFLAGS -Knoieee -Mvect -O3"
+ CFLAGS="$CFLAGS -Knoieee -Mvect"
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
fi
AR="ar860 cr$AR_LOCAL"
@@ -1150,9 +1150,9 @@
CFLAGS="$CFLAGS -g $TFLOP_FLAGS"
else
if test "$CC" = "pgcc"; then
- CFLAGS="$CFLAGS -Knoieee -Mvect -O3 $TFLOP_FLAGS"
+ CFLAGS="$CFLAGS -Knoieee -Mvect $TFLOP_FLAGS"
else
- CFLAGS="$CFLAGS -O $TFLOP_FLAGS"
+ CFLAGS="$CFLAGS $TFLOP_FLAGS"
fi
fi
AR="xar cr$AR_LOCAL"
@@ -1268,12 +1268,12 @@
fi
if test $DEBUG = "yes" ; then
if test "$CC" = "gcc" ; then
- CFLAGS="$CFLAGS -g -O -Wall -Wstrict-prototypes -Wmissing-prototypes"
+ CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
else
CFLAGS="$CFLAGS -g"
fi
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
if test "$enable_aio" != "yes" ; then
@@ -1501,7 +1501,7 @@
FFLAGS="$FFLAGS -g"
else
USER_FFLAGS="$FFLAGS -Chopt"
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
FFLAGS="$FFLAGS -Chopt"
fi
@@ -1546,7 +1546,7 @@
if test $DEBUG = "yes"; then
CFLAGS="$CFLAGS -g +w1"
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
{
@@ -1669,7 +1669,7 @@
if test $DEBUG = "yes"; then
CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose"
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
{
@@ -1720,7 +1720,7 @@
if test $DEBUG = "yes"; then
CFLAGS="$CFLAGS -g"
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
{
@@ -2049,7 +2049,7 @@
if test $DEBUG = "yes"; then
CFLAGS="$CFLAGS -g -fullwarn"
else
- CFLAGS="$CFLAGS -O"
+ CFLAGS="$CFLAGS"
fi
if test $osversion = 4 ; then
RANLIB="ar ts"
|
