mirror of
https://gitlab.com/embeddable-common-lisp/ecl.git
synced 2026-01-14 05:12:38 -08:00
Instead of checking for mprotect, check for header sys/mman.h
This commit is contained in:
Juan Jose Garcia Ripoll
parent
95bc1c21c5
commit
da2b7918e4
2 changed files with 100 additions and 55 deletions
153
src/configure
vendored
153
src/configure
vendored
|
|
@ -11250,64 +11250,35 @@ fi
|
|||
done
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for mprotect" >&5
|
||||
echo $ECHO_N "checking for mprotect... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_func_mprotect+set}" = set; then
|
||||
if test "${ac_cv_header_sys_mman_h+set}" = set; then
|
||||
{ echo "$as_me:$LINENO: checking for sys/mman.h" >&5
|
||||
echo $ECHO_N "checking for sys/mman.h... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_header_sys_mman_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mman_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_sys_mman_h" >&6; }
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
# Is the header compilable?
|
||||
{ echo "$as_me:$LINENO: checking sys/mman.h usability" >&5
|
||||
echo $ECHO_N "checking sys/mman.h usability... $ECHO_C" >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
/* Define mprotect to an innocuous variant, in case <limits.h> declares mprotect.
|
||||
For example, HP-UX 11i <limits.h> declares gettimeofday. */
|
||||
#define mprotect innocuous_mprotect
|
||||
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char mprotect (); below.
|
||||
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
|
||||
<limits.h> exists even on freestanding compilers. */
|
||||
|
||||
#ifdef __STDC__
|
||||
# include <limits.h>
|
||||
#else
|
||||
# include <assert.h>
|
||||
#endif
|
||||
|
||||
#undef mprotect
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char mprotect ();
|
||||
/* The GNU C library defines this for functions which it implements
|
||||
to always fail with ENOSYS. Some functions are actually named
|
||||
something starting with __ and the normal name is an alias. */
|
||||
#if defined __stub_mprotect || defined __stub___mprotect
|
||||
choke me
|
||||
#endif
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return mprotect ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
$ac_includes_default
|
||||
#include <sys/mman.h>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
|
|
@ -11316,22 +11287,95 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
|||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
ac_cv_func_mprotect=yes
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_func_mprotect=no
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
echo "${ECHO_T}$ac_header_compiler" >&6; }
|
||||
|
||||
# Is the header present?
|
||||
{ echo "$as_me:$LINENO: checking sys/mman.h presence" >&5
|
||||
echo $ECHO_N "checking sys/mman.h presence... $ECHO_C" >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <sys/mman.h>
|
||||
_ACEOF
|
||||
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null && {
|
||||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
}; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_func_mprotect" >&5
|
||||
echo "${ECHO_T}$ac_cv_func_mprotect" >&6; }
|
||||
if test $ac_cv_func_mprotect = yes; then
|
||||
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
echo "${ECHO_T}$ac_header_preproc" >&6; }
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||||
yes:no: )
|
||||
{ echo "$as_me:$LINENO: WARNING: sys/mman.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
echo "$as_me: WARNING: sys/mman.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: sys/mman.h: proceeding with the compiler's result" >&5
|
||||
echo "$as_me: WARNING: sys/mman.h: proceeding with the compiler's result" >&2;}
|
||||
ac_header_preproc=yes
|
||||
;;
|
||||
no:yes:* )
|
||||
{ echo "$as_me:$LINENO: WARNING: sys/mman.h: present but cannot be compiled" >&5
|
||||
echo "$as_me: WARNING: sys/mman.h: present but cannot be compiled" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: sys/mman.h: check for missing prerequisite headers?" >&5
|
||||
echo "$as_me: WARNING: sys/mman.h: check for missing prerequisite headers?" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: sys/mman.h: see the Autoconf documentation" >&5
|
||||
echo "$as_me: WARNING: sys/mman.h: see the Autoconf documentation" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: sys/mman.h: section \"Present But Cannot Be Compiled\"" >&5
|
||||
echo "$as_me: WARNING: sys/mman.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: sys/mman.h: proceeding with the preprocessor's result" >&5
|
||||
echo "$as_me: WARNING: sys/mman.h: proceeding with the preprocessor's result" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: sys/mman.h: in the future, the compiler will take precedence" >&5
|
||||
echo "$as_me: WARNING: sys/mman.h: in the future, the compiler will take precedence" >&2;}
|
||||
|
||||
;;
|
||||
esac
|
||||
{ echo "$as_me:$LINENO: checking for sys/mman.h" >&5
|
||||
echo $ECHO_N "checking for sys/mman.h... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_header_sys_mman_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_cv_header_sys_mman_h=$ac_header_preproc
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_mman_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_sys_mman_h" >&6; }
|
||||
|
||||
fi
|
||||
if test $ac_cv_header_sys_mman_h = yes; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define ECL_USE_MPROTECT 1
|
||||
_ACEOF
|
||||
|
|
@ -11341,6 +11385,7 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
if test ${with_cxx} = "no" ; then
|
||||
ECL_CC=${CC}
|
||||
|
||||
|
|
|
|||
|
|
@ -537,7 +537,7 @@ AC_CHECK_FUNCS( [expf logf sqrtf cosf sinf tanf sinhf coshf tanhf] \
|
|||
|
||||
AC_CHECK_FUNCS( [sched_yield uname fseeko] )
|
||||
|
||||
AC_CHECK_FUNC( [mprotect], AC_DEFINE(ECL_USE_MPROTECT) )
|
||||
AC_CHECK_HEADER( [sys/mman.h], AC_DEFINE(ECL_USE_MPROTECT) )
|
||||
|
||||
dnl =====================================================================
|
||||
dnl Checks for system services
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue