Commit 19780e20 authored by Marius Gerbershagen's avatar Marius Gerbershagen
Browse files

Merge branch 'xcode12-fixes' into 'develop'

Xcode12 fixes

See merge request embeddable-common-lisp/ecl!242
parents 2985758c da807da4
...@@ -3486,6 +3486,7 @@ else ...@@ -3486,6 +3486,7 @@ else
AC_TRY_RUN([ AC_TRY_RUN([
#include <string.h> /* for strcmp */ #include <string.h> /* for strcmp */
#include <stdio.h> /* for vsnprintf */ #include <stdio.h> /* for vsnprintf */
#include <stdlib.h> /* for exit */
#if HAVE_STDARG #if HAVE_STDARG
#include <stdarg.h> #include <stdarg.h>
...@@ -3659,6 +3660,7 @@ AC_DEFUN([GMP_PROG_CC_FOR_BUILD_WORKS], ...@@ -3659,6 +3660,7 @@ AC_DEFUN([GMP_PROG_CC_FOR_BUILD_WORKS],
# remove anything that might look like compiler output to our "||" expression # remove anything that might look like compiler output to our "||" expression
rm -f conftest* a.out b.out a.exe a_out.exe rm -f conftest* a.out b.out a.exe a_out.exe
cat >conftest.c <<EOF cat >conftest.c <<EOF
#include <stdlib.h>
int int
main () main ()
{ {
...@@ -3733,6 +3735,7 @@ AC_DEFUN([GMP_PROG_EXEEXT_FOR_BUILD], ...@@ -3733,6 +3735,7 @@ AC_DEFUN([GMP_PROG_EXEEXT_FOR_BUILD],
AC_CACHE_CHECK([for build system executable suffix], AC_CACHE_CHECK([for build system executable suffix],
gmp_cv_prog_exeext_for_build, gmp_cv_prog_exeext_for_build,
[cat >conftest.c <<EOF [cat >conftest.c <<EOF
#include <stdlib.h>
int int
main () main ()
{ {
...@@ -3769,6 +3772,7 @@ AC_DEFUN([GMP_CHECK_LIBM_FOR_BUILD], ...@@ -3769,6 +3772,7 @@ AC_DEFUN([GMP_CHECK_LIBM_FOR_BUILD],
AC_CACHE_CHECK([for build system compiler math library], AC_CACHE_CHECK([for build system compiler math library],
gmp_cv_check_libm_for_build, gmp_cv_check_libm_for_build,
[cat >conftest.c <<EOF [cat >conftest.c <<EOF
#include <stdlib.h>
int int
main () main ()
{ {
......
...@@ -783,6 +783,7 @@ infodir ...@@ -783,6 +783,7 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
...@@ -880,6 +881,7 @@ datadir='${datarootdir}' ...@@ -880,6 +881,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
...@@ -1132,6 +1134,15 @@ do ...@@ -1132,6 +1134,15 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
   
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
...@@ -1269,7 +1280,7 @@ fi ...@@ -1269,7 +1280,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir libdir localedir mandir runstatedir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
...@@ -1422,6 +1433,7 @@ Fine tuning of the installation directories: ...@@ -1422,6 +1433,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
...@@ -9248,6 +9260,7 @@ $as_echo_n "checking build system compiler $CC_FOR_BUILD... " >&6; } ...@@ -9248,6 +9260,7 @@ $as_echo_n "checking build system compiler $CC_FOR_BUILD... " >&6; }
# remove anything that might look like compiler output to our "||" expression # remove anything that might look like compiler output to our "||" expression
rm -f conftest* a.out b.out a.exe a_out.exe rm -f conftest* a.out b.out a.exe a_out.exe
cat >conftest.c <<EOF cat >conftest.c <<EOF
#include <stdlib.h>
int int
main () main ()
{ {
...@@ -9280,6 +9293,7 @@ $as_echo_n "checking build system compiler $HOST_CC... " >&6; } ...@@ -9280,6 +9293,7 @@ $as_echo_n "checking build system compiler $HOST_CC... " >&6; }
# remove anything that might look like compiler output to our "||" expression # remove anything that might look like compiler output to our "||" expression
rm -f conftest* a.out b.out a.exe a_out.exe rm -f conftest* a.out b.out a.exe a_out.exe
cat >conftest.c <<EOF cat >conftest.c <<EOF
#include <stdlib.h>
int int
main () main ()
{ {
...@@ -9313,6 +9327,7 @@ $as_echo_n "checking build system compiler $i... " >&6; } ...@@ -9313,6 +9327,7 @@ $as_echo_n "checking build system compiler $i... " >&6; }
# remove anything that might look like compiler output to our "||" expression # remove anything that might look like compiler output to our "||" expression
rm -f conftest* a.out b.out a.exe a_out.exe rm -f conftest* a.out b.out a.exe a_out.exe
cat >conftest.c <<EOF cat >conftest.c <<EOF
#include <stdlib.h>
int int
main () main ()
{ {
...@@ -9392,6 +9407,7 @@ if ${gmp_cv_prog_exeext_for_build+:} false; then : ...@@ -9392,6 +9407,7 @@ if ${gmp_cv_prog_exeext_for_build+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
cat >conftest.c <<EOF cat >conftest.c <<EOF
#include <stdlib.h>
int int
main () main ()
{ {
...@@ -9429,6 +9445,7 @@ if ${gmp_cv_check_libm_for_build+:} false; then : ...@@ -9429,6 +9445,7 @@ if ${gmp_cv_check_libm_for_build+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
cat >conftest.c <<EOF cat >conftest.c <<EOF
#include <stdlib.h>
int int
main () main ()
{ {
......
...@@ -490,7 +490,7 @@ extern cl_object ecl_waiter_pop(cl_env_ptr the_env, cl_object q); ...@@ -490,7 +490,7 @@ extern cl_object ecl_waiter_pop(cl_env_ptr the_env, cl_object q);
/* threads/rwlock.d */ /* threads/rwlock.d */
#ifdef ECL_RWLOCK #ifdef ECL_THREADS
extern cl_object mp_get_rwlock_read_wait(cl_object lock); extern cl_object mp_get_rwlock_read_wait(cl_object lock);
extern cl_object mp_get_rwlock_write_wait(cl_object lock); extern cl_object mp_get_rwlock_write_wait(cl_object lock);
#endif #endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment