Skip to content

Commit 47b9745

Browse files
authored
Merge pull request #9839 from jsquyres/pr/fix-ac-lang-program-m4
m4: fix 2 broken uses of AC_LANG_PROGRAM
2 parents 6774357 + 734f340 commit 47b9745

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

config/opal_check_icc.m4

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dnl On EM64T, icc-8.1 before version 8.1.027 segfaulted, since
2525
dnl va_start was miscompiled...
2626
dnl
2727
AC_MSG_CHECKING([whether icc-8.1 for EM64T works with variable arguments])
28-
AC_RUN_IFELSE([AC_LANG_PROGRAM([
28+
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
2929
#include <stdarg.h>
3030
#include <stdio.h>
3131
#include <stdlib.h>
@@ -36,18 +36,12 @@ void func (int c, char * f, ...)
3636
va_start (arglist, f);
3737
/* vprintf (f, arglist); */
3838
va_end (arglist);
39-
}
40-
41-
int main ()
42-
{
39+
}]],[[
4340
FILE *f;
4441
func (4711, "Help %d [%s]\n", 10, "ten");
4542
f=fopen ("conftestval", "w");
4643
if (!f) exit (1);
47-
return 0;
48-
}
49-
50-
])],[opal_ac_icc_varargs=`test -f conftestval`],[opal_ac_icc_varargs=1],[opal_ac_icc_varargs=1])
44+
]])],[opal_ac_icc_varargs=`test -f conftestval`],[opal_ac_icc_varargs=1],[opal_ac_icc_varargs=1])
5145

5246
if test "$opal_ac_icc_varargs" = "1"; then
5347
AC_MSG_WARN([*** Problem running configure test!])

config/opal_config_asm.m4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,12 +1195,8 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
11951195
[AC_MSG_CHECKING([for RDTSCP assembly support])
11961196
AC_LANG_PUSH([C])
11971197
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
1198-
int main(int argc, char* argv[])
1199-
{
12001198
unsigned int rax, rdx;
12011199
__asm__ __volatile__ ("rdtscp\n": "=a" (rax), "=d" (rdx):: "%rax", "%rdx");
1202-
return 0;
1203-
}
12041200
]])],
12051201
[result=1
12061202
AC_MSG_RESULT([yes])],

0 commit comments

Comments
 (0)