hyung-hwan/hcl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed configure.ac to reset DL_LIBS if it's set to 'none required'

Browse Source
This commit is contained in:
hyung-hwan 2018-03-05 04:39:57 +00:00
parent 3eac18548c
commit 474d48a211
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -17671,7 +17671,13 @@ $as_echo "$ac_cv_search_dlopen" >&6; }
ac_res=$ac_cv_search_dlopen ac_res=$ac_cv_search_dlopen
if test "$ac_res" != no; then : if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
DL_LIBS="$ac_cv_search_dlopen"
DL_LIBS="$ac_cv_search_dlopen"
if test "x${DL_LIBS}" = "xnone required"
then
DL_LIBS=""
fi
fi fi
LIBS="$save_LIBS" LIBS="$save_LIBS"

8
configure.ac
View File

@ -136,7 +136,13 @@ AC_CHECK_FUNCS([snprintf _vsnprintf _vsnwprintf])
AC_CHECK_FUNCS([isatty mmap munmap]) AC_CHECK_FUNCS([isatty mmap munmap])
save_LIBS="$LIBS" save_LIBS="$LIBS"
AC_SEARCH_LIBS([dlopen], [dl dld], [DL_LIBS="$ac_cv_search_dlopen"]) AC_SEARCH_LIBS([dlopen], [dl dld], [
DL_LIBS="$ac_cv_search_dlopen"
if test "x${DL_LIBS}" = "xnone required"
then
DL_LIBS=""
fi
])
LIBS="$save_LIBS" LIBS="$save_LIBS"
AC_SUBST(DL_LIBS) AC_SUBST(DL_LIBS)

2
lib/hcl.c
View File

@ -90,7 +90,7 @@ static void* alloc_heap (hcl_t* hcl, hcl_oow_t size)
static void free_heap (hcl_t* hcl, void* ptr) static void free_heap (hcl_t* hcl, void* ptr)
{ {
return HCL_MMGR_FREE(hcl->mmgr, ptr); HCL_MMGR_FREE(hcl->mmgr, ptr);
} }
int hcl_init (hcl_t* hcl, hcl_mmgr_t* mmgr, hcl_oow_t heapsz, const hcl_vmprim_t* vmprim) int hcl_init (hcl_t* hcl, hcl_mmgr_t* mmgr, hcl_oow_t heapsz, const hcl_vmprim_t* vmprim)

2
lib/main.c
View File

@ -450,7 +450,7 @@ static hcl_ooi_t print_handler (hcl_t* hcl, hcl_iocmd_t cmd, void* arg)
static void* alloc_heap (hcl_t* hcl, hcl_oow_t size) static void* alloc_heap (hcl_t* hcl, hcl_oow_t size)
{ {
#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) #if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) && defined(MAP_ANONYMOUS)
/* It's called via hcl_makeheap() when HCL creates a GC heap. /* It's called via hcl_makeheap() when HCL creates a GC heap.
* The heap is large in size. I can use a different memory allocation * The heap is large in size. I can use a different memory allocation
* function instead of an ordinary malloc. * function instead of an ordinary malloc.