diff options
author | Andrew Waterman <andrew@sifive.com> | 2020-09-22 03:18:23 -0700 |
---|---|---|
committer | Andrew Waterman <andrew@sifive.com> | 2020-09-22 03:48:14 -0700 |
commit | b1dc3826d0254b5d4853037cd399560b39745983 (patch) | |
tree | bf982fb84603bf5412e94f5e86e3d5b03e47653c | |
parent | ac46e18f82fd2c040680633e089860998baa5a5d (diff) | |
download | spike-b1dc3826d0254b5d4853037cd399560b39745983.zip spike-b1dc3826d0254b5d4853037cd399560b39745983.tar.gz spike-b1dc3826d0254b5d4853037cd399560b39745983.tar.bz2 |
Don't error out if dlopen isn't available
-rw-r--r-- | config.h.in | 18 | ||||
-rwxr-xr-x | configure | 18 | ||||
-rw-r--r-- | riscv/riscv.ac | 4 |
3 files changed, 27 insertions, 13 deletions
diff --git a/config.h.in b/config.h.in index 4f7f39f..f5bbab1 100644 --- a/config.h.in +++ b/config.h.in @@ -3,27 +3,33 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Define if subproject MCPPBS_SPROJ_NORM is enabled */ +#undef CUSTOMEXT_ENABLED + /* Default value for --isa switch */ #undef DEFAULT_ISA /* Default value for --priv switch */ #undef DEFAULT_PRIV -/* Default value for --vector switch */ +/* Default value for --varch switch */ #undef DEFAULT_VARCH -/* Path to the device-tree-compiler */ +/* Executable name of device-tree-compiler */ #undef DTC /* Define if subproject MCPPBS_SPROJ_NORM is enabled */ -#undef DUMMY_ROCC_ENABLED +#undef FDT_ENABLED + +/* Define if subproject MCPPBS_SPROJ_NORM is enabled */ +#undef FESVR_ENABLED + +/* Dynamic library loading is supported */ +#undef HAVE_DLOPEN /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `fesvr' library (-lfesvr). */ -#undef HAVE_LIBFESVR - /* Define to 1 if you have the `pthread' library (-lpthread). */ #undef HAVE_LIBPTHREAD @@ -676,6 +676,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -760,6 +761,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1012,6 +1014,15 @@ do | -silent | --silent | --silen | --sile | --sil) 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) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1149,7 +1160,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1302,6 +1313,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -4840,9 +4852,7 @@ ac_res=$ac_cv_search_dlopen if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else - - as_fn_error $? "unable to find the dlopen() function" "$LINENO" 5 +$as_echo "#define HAVE_DLOPEN /**/" >>confdefs.h fi diff --git a/riscv/riscv.ac b/riscv/riscv.ac index 3bf3ec2..624e981 100644 --- a/riscv/riscv.ac +++ b/riscv/riscv.ac @@ -19,9 +19,7 @@ AC_ARG_WITH(varch, AC_DEFINE_UNQUOTED([DEFAULT_VARCH], ["vlen:128,elen:64,slen:128"], [Default value for --varch switch])) -AC_SEARCH_LIBS([dlopen], [dl dld], [], [ - AC_MSG_ERROR([unable to find the dlopen() function]) -]) +AC_SEARCH_LIBS([dlopen], [dl dld], AC_DEFINE([HAVE_DLOPEN], [], [Dynamic library loading is supported])) AC_CHECK_LIB(pthread, pthread_create, [], [AC_MSG_ERROR([libpthread is required])]) |