mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 931043 - use AC_TRY_COMPILE to check for how to copy va_args; r=glandium 

We shouldn't need to run these programs; compiling them should be enough.

While we're at it, we can remove support for __va_copy, which, AFAICS, is an
old GNU extension and has been superseded by va_copy by anyplace that cares.
This commit is contained in:
Nathan Froyd 2013-10-25 11:15:17 -04:00
Родитель 1dbb0fe831
Коммит acf7346f71
2 изменённых файлов: 40 добавлений и 97 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

69
configure.in
Просмотреть файл

@ -3156,13 +3156,10 @@ AC_LANG_C
dnl **********************
dnl *** va_copy checks ***
dnl **********************
dnl we currently check for all three va_copy possibilities, so we get
dnl all results in config.log for bug reports.
AC_MSG_CHECKING(for an implementation of va_copy())
AC_CACHE_VAL(ac_cv_va_copy,[
AC_TRY_RUN([
#include <stdarg.h>
AC_CACHE_CHECK([for an implementation of va_copy()],
ac_cv_va_copy,
[AC_TRY_COMPILE([#include <stdarg.h>
#include <stdlib.h>
void f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
@ -3170,37 +3167,16 @@ AC_CACHE_VAL(ac_cv_va_copy,[
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
exit (1);
va_end (args1); va_end (args2);
}
int main() { f (0, 42); return 0; }],
ac_cv_va_copy=yes,
ac_cv_va_copy=no,
ac_cv_va_copy=no
)
])
AC_MSG_RESULT($ac_cv_va_copy)
AC_MSG_CHECKING(for an implementation of __va_copy())
AC_CACHE_VAL(ac_cv___va_copy,[
AC_TRY_RUN([
#include <stdarg.h>
void f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
__va_copy (args2, args1);
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
exit (1);
va_end (args1); va_end (args2);
}
int main() { f (0, 42); return 0; }],
ac_cv___va_copy=yes,
ac_cv___va_copy=no,
ac_cv___va_copy=no
)
])
AC_MSG_RESULT($ac_cv___va_copy)
AC_MSG_CHECKING(whether va_lists can be copied by value)
AC_CACHE_VAL(ac_cv_va_val_copy,[
AC_TRY_RUN([
#include <stdarg.h>
}],
[f(0, 42); return 0],
[ac_cv_va_copy=yes],
[ac_cv_va_copy=no]
)]
)
AC_CACHE_CHECK([whether va_list can be copied by value],
ac_cv_va_val_copy,
[AC_TRY_COMPILE([#include <stdarg.h>
#include <stdlib.h>
void f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
@ -3208,25 +3184,20 @@ AC_CACHE_VAL(ac_cv_va_val_copy,[
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
exit (1);
va_end (args1); va_end (args2);
}
int main() { f (0, 42); return 0; }],
ac_cv_va_val_copy=yes,
ac_cv_va_val_copy=no,
ac_cv_va_val_copy=yes
)
])
}],
[f(0, 42); return 0],
[ac_cv_va_val_copy=yes],
[ac_cv_va_val_copy=no],
)]
)
if test "x$ac_cv_va_copy" = "xyes"; then
AC_DEFINE(VA_COPY, va_copy)
AC_DEFINE(HAVE_VA_COPY)
elif test "x$ac_cv___va_copy" = "xyes"; then
AC_DEFINE(VA_COPY, __va_copy)
AC_DEFINE(HAVE_VA_COPY)
fi
if test "x$ac_cv_va_val_copy" = "xno"; then
AC_DEFINE(HAVE_VA_LIST_AS_ARRAY)
fi
AC_MSG_RESULT($ac_cv_va_val_copy)
dnl ===================================================================
dnl ========================================================

68
js/src/configure.in
Просмотреть файл

@ -2563,12 +2563,10 @@ AC_LANG_C
dnl **********************
dnl *** va_copy checks ***
dnl **********************
dnl we currently check for all three va_copy possibilities, so we get
dnl all results in config.log for bug reports.
AC_MSG_CHECKING(for an implementation of va_copy())
AC_CACHE_VAL(ac_cv_va_copy,[
AC_TRY_RUN([
#include <stdarg.h>
AC_CACHE_CHECK([for an implementation of va_copy()],
ac_cv_va_copy,
[AC_TRY_COMPILE([#include <stdarg.h>
#include <stdlib.h>
void f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
@ -2576,37 +2574,16 @@ AC_CACHE_VAL(ac_cv_va_copy,[
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
exit (1);
va_end (args1); va_end (args2);
}
int main() { f (0, 42); return 0; }],
ac_cv_va_copy=yes,
ac_cv_va_copy=no,
ac_cv_va_copy=no
)
])
AC_MSG_RESULT($ac_cv_va_copy)
AC_MSG_CHECKING(for an implementation of __va_copy())
AC_CACHE_VAL(ac_cv___va_copy,[
AC_TRY_RUN([
#include <stdarg.h>
void f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
__va_copy (args2, args1);
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
exit (1);
va_end (args1); va_end (args2);
}
int main() { f (0, 42); return 0; }],
ac_cv___va_copy=yes,
ac_cv___va_copy=no,
ac_cv___va_copy=no
)
])
AC_MSG_RESULT($ac_cv___va_copy)
AC_MSG_CHECKING(whether va_lists can be copied by value)
AC_CACHE_VAL(ac_cv_va_val_copy,[
AC_TRY_RUN([
#include <stdarg.h>
}],
[f(0, 42); return 0],
[ac_cv_va_copy=yes],
[ac_cv_va_copy=no]
)]
)
AC_CACHE_CHECK([whether va_list can be copied by value],
ac_cv_va_val_copy,
[AC_TRY_COMPILE([#include <stdarg.h>
#include <stdlib.h>
void f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
@ -2614,25 +2591,20 @@ AC_CACHE_VAL(ac_cv_va_val_copy,[
if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
exit (1);
va_end (args1); va_end (args2);
}
int main() { f (0, 42); return 0; }],
ac_cv_va_val_copy=yes,
ac_cv_va_val_copy=no,
ac_cv_va_val_copy=yes
)
])
}],
[f(0, 42); return 0],
[ac_cv_va_val_copy=yes],
[ac_cv_va_val_copy=no],
)]
)
if test "x$ac_cv_va_copy" = "xyes"; then
AC_DEFINE(VA_COPY, va_copy)
AC_DEFINE(HAVE_VA_COPY)
elif test "x$ac_cv___va_copy" = "xyes"; then
AC_DEFINE(VA_COPY, __va_copy)
AC_DEFINE(HAVE_VA_COPY)
fi
if test "x$ac_cv_va_val_copy" = "xno"; then
AC_DEFINE(HAVE_VA_LIST_AS_ARRAY)
fi
AC_MSG_RESULT($ac_cv_va_val_copy)
dnl ===================================================================
dnl ========================================================