Merge branch 'micro' into minor

* micro:
  compile: add icl to compile wrapper script

Signed-off-by: Peter Rosin <peda@lysator.liu.se>

6 files changed, 108 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 9f76c1f63..af904d442 100644
--- a/NEWS
+++ b/NEWS
@@ -105,6 +105,16 @@ New in 1.16:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+New in 1.15.1:
+
+* Miscellaneous changes:
+
+  - Support the Windows version of the Intel C Compiler (icl) in the
+    'compile' script in the same way the (compatible) Microsoft C Compiler
+	is supported.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 New in 1.15:
 
 * Improvements and refactorings in the install-sh script:
diff --git a/THANKS b/THANKS
index 8b87d585b..04ddb1357 100644
--- a/THANKS
+++ b/THANKS
@@ -200,6 +200,7 @@ John Pierce                     hawkfan@pyrotechnics.com
 John Ratliff                    autoconf@technoplaza.net
 John R. Cary                    cary@txcorp.com
 John W. Coomes                  jcoomes@eng.Sun.COM
+Jonathan L Peyton               jonathan.l.peyton@intel.com
 Jonathan Nieder                 jrnieder@gmail.com
 Joseph S. Myers                 joseph@codesourcery.com
 Josh MacDonald                  jmacd@cs.berkeley.edu
diff --git a/lib/compile b/lib/compile
index 69fad9c95..dc7a6e7df 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2015-11-24.11; # UTC
 
 # Copyright (C) 1999-2015 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index 35541c323..529d93bcd 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -779,6 +779,17 @@ require_tool ()
       $CC -? </dev/null \
         || skip_all_ "Microsoft C compiler '$CC' not available"
       ;;
+    icl)
+      CC=icl
+      # Don't export CFLAGS, as that could have been initialized to only
+      # work with the C compiler detected at configure time.  If the user
+      # wants CFLAGS to also influence 'icl', he can still export CFLAGS
+      # in the environment "by hand" before calling the testsuite.
+      export CC CPPFLAGS
+      echo "$me: running $CC -?"
+      $CC -? >/dev/null \
+        || skip_all_ "Intel C compiler '$CC' not available"
+      ;;
     etags)
       # Exuberant Ctags will create a TAGS file even
       # when asked for --help or --version.  (Emacs's etags
diff --git a/t/compile7.sh b/t/compile7.sh
new file mode 100644
index 000000000..0dad8fb70
--- /dev/null
+++ b/t/compile7.sh
@@ -0,0 +1,82 @@
+#! /bin/sh
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make sure 'compile' wraps the Intel C/C++ compiler (icl) correctly
+# with respect to absolute paths.
+
+required='icl'
+. test-init.sh
+
+get_shell_script compile
+
+mkdir sub
+
+cat >sub/foo.c <<'EOF'
+int foo (void)
+{
+  return 0;
+}
+EOF
+
+cat >main.c <<'EOF'
+extern int foo (void);
+int main (void)
+{
+  return foo ();
+}
+EOF
+
+cwd=$(pwd) || fatal_ "cannot get current directory"
+absfoodir=$cwd/sub
+absmainc=$cwd/main.c
+absmainobj=$cwd/main.obj
+
+cat >> configure.ac << 'END'
+AC_PROG_CC
+AM_PROG_AR
+AC_PROG_RANLIB
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+END
+
+cat > sub/Makefile.am << 'END'
+lib_LIBRARIES = libfoo.a
+libfoo_a_SOURCES = foo.c
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE
+
+./compile icl $CPPFLAGS $CFLAGS -c -o "$absmainobj" "$absmainc"
+
+# POSIX mandates that the compiler accepts a space between the -I,
+# -l and -L options and their respective arguments.  Traditionally,
+# this should work also without a space.  Try both usages.
+for sp in '' ' '; do
+  rm -f main
+  ./compile icl $CFLAGS $LDFLAGS -L${sp}"$absfoodir" "$absmainobj" \
+               -o main -l${sp}foo
+  ./main
+done
+
+:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 80d0f0864..defca1361 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -271,6 +271,7 @@ t/compile3.sh \
 t/compile4.sh \
 t/compile5.sh \
 t/compile6.sh \
+t/compile7.sh \
 t/compile_f90_c_cxx.sh \
 t/compile_f_c_cxx.sh \
 t/cond-basic.sh \