Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20170/conf

Modified Files:
      Tag: MonetDB_1-18
        MonetDB.m4 
Log Message:
added support or icc 10 (the auto* tools are not really helping jet, ie
we need to add -fPIC, the hard way in MonetDB.m4)


Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -d -r1.16.2.5 -r1.16.2.6
--- MonetDB.m4  7 Jun 2007 13:57:08 -0000       1.16.2.5
+++ MonetDB.m4  8 Jun 2007 08:19:19 -0000       1.16.2.6
@@ -35,6 +35,7 @@
        case $icc_ver in
        8.*)    CC="$CC -no-gcc";;
        9.*)    CC="$CC -no-gcc";;
+       10.*)   CC="$CC -no-gcc";;
        esac
        ;;
 esac
@@ -584,12 +585,16 @@
        case $icc_ver in
        8.1*)   CFLAGS="$CFLAGS -wd1418" ;;
        9.*)    CFLAGS="$CFLAGS -wd1418" ;;
+       10.*)   CFLAGS="$CFLAGS -wd1418" 
+               dnl icc needs -fPIC (but the current autoconf still uses -KPIC)
+               CC="$CC -fPIC"           ;;
        *)      ;;
        esac
        dnl  Version 8.* doesn't find sigset_t when -ansi is set... !?
        case $icc_ver in
        8.*)    ;;
        9.*)    ;;
+       10.*)   ;;
        *)      CFLAGS="$CFLAGS -ansi";;
        esac
        dnl  Be picky; "-Werror" seems to be too rigid for autoconf...
@@ -604,6 +609,7 @@
        case $icc_ver in
        8.[[1-9]]*)     X_CFLAGS="$X_CFLAGS,1572" ;;
        9.[[1-9]]*)     X_CFLAGS="$X_CFLAGS,1572,1599" ;;
+       10.*)           X_CFLAGS="$X_CFLAGS,1572,1599" ;;
        esac
        dnl  #1418: external definition with no prior declaration
        dnl  #1419: external declaration in primary source file
@@ -689,7 +695,10 @@
        esac
        ;;
 -icc*-linux*|-ecc*-linux*)
-       CFLAGS="$CFLAGS -c99"
+       case "$host-$icc_ver" in
+        *-*-*-10.*)    CFLAGS="$CFLAGS -std=c99"       ;;
+       *-*-*-)         CFLAGS="$CFLAGS -c99"           ;;
+       esac   
        ;;
 -pgcc*-linux*)
        CFLAGS="$CFLAGS -c9x"
@@ -1489,10 +1498,13 @@
       dnl  Hence, we skip Interprocedural (IP) Optimization with icc-8.*.
       x86_64-*-*-8.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll               
-tpp7 -axWP   ";;
       x86_64-*-*-9.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll               
-tpp7 -axWP   ";;
+      x86_64-*-*-10.*) CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll              
 -tpp7 -axWP   ";;
       i*86-*-*-8.*)   CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll               
-tpp6 -axKWNPB";;
       i*86-*-*-9.*)   CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll               
-tpp6 -axKWNPB";;
+      i*86-*-*-10.*)   CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll              
 -tpp6 -axKWNPB";;
       ia64-*-*-8.*)   CFLAGS="$CFLAGS -mp1 -O2 -restrict -unroll               
-tpp2 -mcpu=itanium2";;
       ia64-*-*-9.*)   CFLAGS="$CFLAGS -mp1 -O2 -restrict -unroll               
-tpp2 -mcpu=itanium2";;
+      ia64-*-*-10.*)   CFLAGS="$CFLAGS -mp1 -O2 -restrict -unroll              
 -tpp2 -mcpu=itanium2";;
       i*86-*-*)       CFLAGS="$CFLAGS -mp1 -O3 -restrict -unroll -ipo -ipo_obj 
-tpp6 -axiMKW";;
       ia64-*-*)       CFLAGS="$CFLAGS -mp1 -O2 -restrict -unroll -ipo -ipo_obj 
-tpp2 -mcpu=itanium2"
                       dnl  With "-O3", ecc does not seem to produce 
stable/correct? binaries under Linux64


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to