mpich-opt.patch

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