| |
| |
| @@ -804,6 +804,9 @@ |
| microblaze*) |
| basic_machine=microblaze-xilinx |
| ;; |
| + midipix) |
| + os=-midipix; |
| + ;; |
| mingw64) |
| basic_machine=x86_64-pc |
| os=-mingw64 |
| @@ -1384,7 +1387,7 @@ |
| | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
| | -chorusos* | -chorusrdb* | -cegcc* \ |
| | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
| - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
| + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
| | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
| | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ |
| | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
| |
| |
| @@ -12,7 +12,7 @@ |
| #elif defined(__hpux) |
| #include "arc4random_hpux.h" |
| |
| -#elif defined(__linux__) |
| +#elif defined(__linux__) || defined(__MIDIPIX) |
| #include "arc4random_linux.h" |
| |
| #elif defined(__NetBSD__) |
| |
| |
| @@ -27,7 +27,7 @@ |
| #include <sys/ioctl.h> |
| #include <sys/resource.h> |
| #include <sys/syscall.h> |
| -#ifdef SYS__sysctl |
| +#if defined(SYS__sysctl) && !defined(__MIDIPIX) |
| #include <linux/sysctl.h> |
| #endif |
| #include <sys/statvfs.h> |
| @@ -49,8 +49,10 @@ |
| #include <time.h> |
| #include <openssl/sha.h> |
| |
| +#ifndef __MIDIPIX |
| #include <linux/types.h> |
| #include <linux/random.h> |
| +#endif |
| #ifdef HAVE_GETAUXVAL |
| #include <sys/auxv.h> |
| #endif |
| @@ -78,7 +80,7 @@ |
| static int getentropy_getrandom(void *buf, size_t len); |
| #endif |
| static int getentropy_urandom(void *buf, size_t len); |
| -#ifdef SYS__sysctl |
| +#if defined(SYS__sysctl) && !defined(__MIDIPIX) |
| static int getentropy_sysctl(void *buf, size_t len); |
| #endif |
| static int getentropy_fallback(void *buf, size_t len); |
| @@ -115,7 +117,7 @@ |
| if (ret != -1) |
| return (ret); |
| |
| -#ifdef SYS__sysctl |
| +#if defined(SYS__sysctl) && !defined(__MIDIPIX) |
| /* |
| * Try to use sysctl CTL_KERN, KERN_RANDOM, RANDOM_UUID. |
| * sysctl is a failsafe API, so it guarantees a result. This |
| @@ -241,10 +243,12 @@ |
| close(fd); |
| goto nodevrandom; |
| } |
| +#ifndef __MIDIPIX |
| if (ioctl(fd, RNDGETENTCNT, &cnt) == -1) { |
| close(fd); |
| goto nodevrandom; |
| } |
| +#endif |
| for (i = 0; i < len; ) { |
| size_t wanted = len - i; |
| ssize_t ret = read(fd, (char *)buf + i, wanted); |
| @@ -267,7 +271,7 @@ |
| return -1; |
| } |
| |
| -#ifdef SYS__sysctl |
| +#if defined(SYS__sysctl) && !defined(__MIDIPIX) |
| static int |
| getentropy_sysctl(void *buf, size_t len) |
| { |
| |
| |
| @@ -111,10 +111,11 @@ |
| @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__append_19 = compat/getentropy_freebsd.c |
| @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__append_20 = compat/getentropy_hpux.c |
| @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__append_21 = compat/getentropy_linux.c |
| -@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__append_22 = compat/getentropy_netbsd.c |
| -@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__append_23 = compat/getentropy_osx.c |
| -@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__append_24 = compat/getentropy_solaris.c |
| -@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__append_25 = compat/getentropy_win.c |
| +@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_MIDIPIX_TRUE@am__append_22 = compat/getentropy_linux.c |
| +@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__append_23 = compat/getentropy_netbsd.c |
| +@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__append_24 = compat/getentropy_osx.c |
| +@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__append_25 = compat/getentropy_solaris.c |
| +@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__append_26 = compat/getentropy_win.c |
| @HOST_ASM_ELF_X86_64_TRUE@am__append_26 = -DAES_ASM -DBSAES_ASM \ |
| @HOST_ASM_ELF_X86_64_TRUE@ -DVPAES_ASM -DOPENSSL_IA32_SSE2 \ |
| @HOST_ASM_ELF_X86_64_TRUE@ -DOPENSSL_BN_ASM_MONT \ |
| @@ -220,17 +221,18 @@ |
| @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_FREEBSD_TRUE@am__objects_13 = compat/getentropy_freebsd.lo |
| @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_HPUX_TRUE@am__objects_14 = compat/getentropy_hpux.lo |
| @HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_LINUX_TRUE@am__objects_15 = compat/getentropy_linux.lo |
| -@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__objects_16 = compat/getentropy_netbsd.lo |
| -@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__objects_17 = compat/getentropy_osx.lo |
| -@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__objects_18 = compat/getentropy_solaris.lo |
| -@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__objects_19 = compat/getentropy_win.lo |
| +@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_MIDIPIX_TRUE@am__objects_16 = compat/getentropy_linux.lo |
| +@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_NETBSD_TRUE@am__objects_17 = compat/getentropy_netbsd.lo |
| +@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_DARWIN_TRUE@am__objects_18 = compat/getentropy_osx.lo |
| +@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_SOLARIS_TRUE@am__objects_19 = compat/getentropy_solaris.lo |
| +@HAVE_ARC4RANDOM_BUF_FALSE@@HAVE_GETENTROPY_FALSE@@HOST_WIN_TRUE@am__objects_20 = compat/getentropy_win.lo |
| am_libcompat_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ |
| $(am__objects_3) $(am__objects_4) $(am__objects_5) \ |
| $(am__objects_6) $(am__objects_7) $(am__objects_8) \ |
| $(am__objects_9) $(am__objects_10) $(am__objects_11) \ |
| $(am__objects_12) $(am__objects_13) $(am__objects_14) \ |
| $(am__objects_15) $(am__objects_16) $(am__objects_17) \ |
| - $(am__objects_18) $(am__objects_19) |
| + $(am__objects_18) $(am__objects_19) $(am__objects_20) |
| libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS) |
| AM_V_lt = $(am__v_lt_@AM_V@) |
| am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) |
| @@ -985,7 +987,7 @@ |
| $(am__append_16) $(am__append_17) $(am__append_18) \ |
| $(am__append_19) $(am__append_20) $(am__append_21) \ |
| $(am__append_22) $(am__append_23) $(am__append_24) \ |
| - $(am__append_25) |
| + $(am__append_25) $(am__append_26) |
| libcompat_la_LIBADD = $(PLATFORM_LDADD) |
| |
| # rc4 |
| |
| |
| @@ -21,7 +21,7 @@ |
| #define BYTE_ORDER BIG_ENDIAN |
| #endif |
| |
| -#elif defined(__linux__) |
| +#elif defined(__linux__) || defined(__MIDIPIX) |
| #include <endian.h> |
| |
| #elif defined(__sun) || defined(_AIX) || defined(__hpux) |
| |
| |
| @@ -690,6 +690,8 @@ |
| HOST_NETBSD_TRUE |
| HOST_LINUX_FALSE |
| HOST_LINUX_TRUE |
| +HOST_MIDIPIX_FALSE |
| +HOST_MIDIPIX_TRUE |
| HOST_HPUX_FALSE |
| HOST_HPUX_TRUE |
| HOST_FREEBSD_FALSE |
| @@ -10824,7 +10826,7 @@ |
| ;; |
| |
| # This must be glibc/ELF. |
| -linux* | k*bsd*-gnu | kopensolaris*-gnu) |
| +linux* | k*bsd*-gnu | kopensolaris*-gnu | midipix*) |
| version_type=linux # correct to gnu/linux during the next big refactor |
| need_lib_prefix=no |
| need_version=no |
| @@ -11902,6 +11904,11 @@ |
| HOST_ABI=elf |
| CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE" |
| ;; |
| + *midipix*) |
| + HOST_OS=midipix |
| + HOST_ABI=pe |
| + CFLAGS="$CFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE" |
| + ;; |
| *netbsd*) |
| HOST_OS=netbsd |
| CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE" |
| @@ -11981,6 +11988,14 @@ |
| HOST_LINUX_FALSE= |
| fi |
| |
| + if test x$HOST_OS = xmidipix; then |
| + HOST_MIDIPIX_TRUE= |
| + HOST_MIDIPIX_FALSE='#' |
| +else |
| + HOST_MIDIPIX_TRUE='#' |
| + HOST_MIDIPIX_FALSE= |
| +fi |
| + |
| if test x$HOST_OS = xnetbsd; then |
| HOST_NETBSD_TRUE= |
| HOST_NETBSD_FALSE='#' |
| @@ -13422,6 +13437,10 @@ |
| as_fn_error $? "conditional \"HOST_LINUX\" was never defined. |
| Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| fi |
| +if test -z "${HOST_MIDIPIX_TRUE}" && test -z "${HOST_MIDIPIX_FALSE}"; then |
| + as_fn_error $? "conditional \"HOST_MIDIPIX\" was never defined. |
| +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| +fi |
| if test -z "${HOST_NETBSD_TRUE}" && test -z "${HOST_NETBSD_FALSE}"; then |
| as_fn_error $? "conditional \"HOST_NETBSD\" was never defined. |
| Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| @@ -15584,3 +15603,15 @@ |
| $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} |
| fi |
| |
| +# a transitional workaround... |
| +case $host_os in |
| + midipix*) |
| + cp $ac_confdir/libtool.midipix libtool || exit 2 |
| + |
| + sed -i -e 's/@cbb_host_os@/'$host'/g' \ |
| + -e 's/@cbb_build_alias@/'$build_alias'/g' \ |
| + -e 's/@cbb_build_os@/'$build_os'/g' \ |
| + -e 's/@cbb_build@/'$build'/g' libtool || exit 2 |
| + ;; |
| +esac |
| + |