diff options
| -rw-r--r-- | autoconf/configure.ac | 8 | ||||
| -rw-r--r-- | autoconf/m4/ltdl.m4 | 28 | ||||
| -rwxr-xr-x | cmake/config-ix.cmake | 35 | ||||
| -rw-r--r-- | include/llvm/Config/config.h.cmake | 81 | ||||
| -rw-r--r-- | include/llvm/Config/config.h.in | 84 | ||||
| -rw-r--r-- | include/llvm/Support/DataTypes.h.cmake | 3 | ||||
| -rw-r--r-- | include/llvm/Support/DataTypes.h.in | 3 | ||||
| -rw-r--r-- | lib/Support/Errno.cpp | 4 | ||||
| -rw-r--r-- | lib/Support/Unix/Path.inc | 8 | ||||
| -rw-r--r-- | lib/Support/Unix/Unix.h | 10 |
10 files changed, 12 insertions, 252 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index b068a04..97a1429 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1531,11 +1531,11 @@ AC_HEADER_TIME AC_LANG_PUSH([C++]) AC_CHECK_HEADERS([cxxabi.h]) AC_LANG_POP([C++]) -AC_CHECK_HEADERS([dlfcn.h execinfo.h fcntl.h inttypes.h limits.h link.h]) +AC_CHECK_HEADERS([dlfcn.h execinfo.h fcntl.h inttypes.h link.h]) AC_CHECK_HEADERS([malloc.h setjmp.h signal.h stdint.h termios.h unistd.h]) -AC_CHECK_HEADERS([utime.h windows.h]) +AC_CHECK_HEADERS([utime.h]) AC_CHECK_HEADERS([sys/mman.h sys/param.h sys/resource.h sys/time.h sys/uio.h]) -AC_CHECK_HEADERS([sys/types.h sys/ioctl.h malloc/malloc.h mach/mach.h]) +AC_CHECK_HEADERS([sys/ioctl.h malloc/malloc.h mach/mach.h]) AC_CHECK_HEADERS([valgrind/valgrind.h]) AC_CHECK_HEADERS([fenv.h]) AC_CHECK_DECLS([FE_ALL_EXCEPT, FE_INEXACT], [], [], [[#include <fenv.h>]]) @@ -1610,7 +1610,7 @@ AC_CHECK_FUNCS([powf fmodf strtof round ]) AC_CHECK_FUNCS([log log2 log10 exp exp2]) AC_CHECK_FUNCS([getpagesize getrusage getrlimit setrlimit gettimeofday ]) AC_CHECK_FUNCS([isatty mkdtemp mkstemp ]) -AC_CHECK_FUNCS([mktemp posix_spawn pread realpath sbrk setrlimit strdup ]) +AC_CHECK_FUNCS([mktemp posix_spawn pread realpath sbrk setrlimit ]) AC_CHECK_FUNCS([strerror strerror_r setenv arc4random ]) AC_CHECK_FUNCS([strtoll strtoq sysconf malloc_zone_statistics ]) AC_CHECK_FUNCS([setjmp longjmp sigsetjmp siglongjmp writev]) diff --git a/autoconf/m4/ltdl.m4 b/autoconf/m4/ltdl.m4 index 0a36dbe..0226f63 100644 --- a/autoconf/m4/ltdl.m4 +++ b/autoconf/m4/ltdl.m4 @@ -77,15 +77,9 @@ AC_REQUIRE([AC_LTDL_DLSYM_USCORE]) AC_REQUIRE([AC_LTDL_SYS_DLOPEN_DEPLIBS]) AC_REQUIRE([AC_LTDL_FUNC_ARGZ]) -AC_CHECK_HEADERS([assert.h ctype.h errno.h malloc.h memory.h stdlib.h \ - stdio.h unistd.h]) -AC_CHECK_HEADERS([dl.h sys/dl.h dld.h mach-o/dyld.h]) -AC_CHECK_HEADERS([string.h strings.h], [break]) - -AC_CHECK_FUNCS([strchr index], [break]) -AC_CHECK_FUNCS([strrchr rindex], [break]) -AC_CHECK_FUNCS([memcpy bcopy], [break]) -AC_CHECK_FUNCS([memmove strcmp]) +AC_CHECK_HEADERS([errno.h malloc.h memory.h unistd.h]) +AC_CHECK_HEADERS([mach-o/dyld.h]) + AC_CHECK_FUNCS([closedir opendir readdir]) ])# AC_LIB_LTDL @@ -385,19 +379,3 @@ if test x"$libltdl_cv_need_uscore" = xyes; then [Define if dlsym() requires a leading underscore in symbol names.]) fi ])# AC_LTDL_DLSYM_USCORE - -# AC_LTDL_FUNC_ARGZ -# ----------------- -AC_DEFUN([AC_LTDL_FUNC_ARGZ], -[AC_CHECK_HEADERS([argz.h]) - -AC_CHECK_TYPES([error_t], - [], - [AC_DEFINE([error_t], [int], - [Define to a type to use for `error_t' if it is not otherwise available.])], - [#if HAVE_ARGZ_H -# include <argz.h> -#endif]) - -AC_CHECK_FUNCS([argz_append argz_create_sep argz_insert argz_next argz_stringify]) -])# AC_LTDL_FUNC_ARGZ diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index ae914d2..9f686c3 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -35,37 +35,24 @@ function(check_type_exists type files variable) endfunction() # include checks -check_include_file(argz.h HAVE_ARGZ_H) -check_include_file(assert.h HAVE_ASSERT_H) -check_include_file(ctype.h HAVE_CTYPE_H) check_include_file_cxx(cxxabi.h HAVE_CXXABI_H) check_include_file(dirent.h HAVE_DIRENT_H) -check_include_file(dl.h HAVE_DL_H) -check_include_file(dld.h HAVE_DLD_H) check_include_file(dlfcn.h HAVE_DLFCN_H) check_include_file(errno.h HAVE_ERRNO_H) check_include_file(execinfo.h HAVE_EXECINFO_H) check_include_file(fcntl.h HAVE_FCNTL_H) check_include_file(inttypes.h HAVE_INTTYPES_H) check_include_file(limits.h HAVE_LIMITS_H) -check_include_file(link.h HAVE_LINK_H) check_include_file(malloc.h HAVE_MALLOC_H) check_include_file(malloc/malloc.h HAVE_MALLOC_MALLOC_H) -check_include_file(memory.h HAVE_MEMORY_H) check_include_file(ndir.h HAVE_NDIR_H) if( NOT PURE_WINDOWS ) check_include_file(pthread.h HAVE_PTHREAD_H) endif() check_include_file(sanitizer/msan_interface.h HAVE_SANITIZER_MSAN_INTERFACE_H) -check_include_file(setjmp.h HAVE_SETJMP_H) check_include_file(signal.h HAVE_SIGNAL_H) check_include_file(stdint.h HAVE_STDINT_H) -check_include_file(stdio.h HAVE_STDIO_H) -check_include_file(stdlib.h HAVE_STDLIB_H) -check_include_file(string.h HAVE_STRING_H) -check_include_file(strings.h HAVE_STRINGS_H) check_include_file(sys/dir.h HAVE_SYS_DIR_H) -check_include_file(sys/dl.h HAVE_SYS_DL_H) check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H) check_include_file(sys/mman.h HAVE_SYS_MMAN_H) check_include_file(sys/ndir.h HAVE_SYS_NDIR_H) @@ -73,14 +60,12 @@ check_include_file(sys/param.h HAVE_SYS_PARAM_H) check_include_file(sys/resource.h HAVE_SYS_RESOURCE_H) check_include_file(sys/stat.h HAVE_SYS_STAT_H) check_include_file(sys/time.h HAVE_SYS_TIME_H) -check_include_file(sys/types.h HAVE_SYS_TYPES_H) check_include_file(sys/uio.h HAVE_SYS_UIO_H) check_include_file(sys/wait.h HAVE_SYS_WAIT_H) check_include_file(termios.h HAVE_TERMIOS_H) check_include_file(unistd.h HAVE_UNISTD_H) check_include_file(utime.h HAVE_UTIME_H) check_include_file(valgrind/valgrind.h HAVE_VALGRIND_VALGRIND_H) -check_include_file(windows.h HAVE_WINDOWS_H) check_include_file(zlib.h HAVE_ZLIB_H) check_include_file(fenv.h HAVE_FENV_H) check_symbol_exists(FE_ALL_EXCEPT "fenv.h" HAVE_DECL_FE_ALL_EXCEPT) @@ -121,7 +106,6 @@ check_symbol_exists(getpagesize unistd.h HAVE_GETPAGESIZE) check_symbol_exists(getrusage sys/resource.h HAVE_GETRUSAGE) check_symbol_exists(setrlimit sys/resource.h HAVE_SETRLIMIT) check_symbol_exists(isatty unistd.h HAVE_ISATTY) -check_symbol_exists(index strings.h HAVE_INDEX) check_symbol_exists(isinf cmath HAVE_ISINF_IN_CMATH) check_symbol_exists(isinf math.h HAVE_ISINF_IN_MATH_H) check_symbol_exists(finite ieeefp.h HAVE_FINITE_IN_IEEEFP_H) @@ -162,11 +146,6 @@ check_symbol_exists(gettimeofday sys/time.h HAVE_GETTIMEOFDAY) check_symbol_exists(getrlimit "sys/types.h;sys/time.h;sys/resource.h" HAVE_GETRLIMIT) check_symbol_exists(posix_spawn spawn.h HAVE_POSIX_SPAWN) check_symbol_exists(pread unistd.h HAVE_PREAD) -check_symbol_exists(rindex strings.h HAVE_RINDEX) -check_symbol_exists(strchr string.h HAVE_STRCHR) -check_symbol_exists(strcmp string.h HAVE_STRCMP) -check_symbol_exists(strdup string.h HAVE_STRDUP) -check_symbol_exists(strrchr string.h HAVE_STRRCHR) check_symbol_exists(sbrk unistd.h HAVE_SBRK) check_symbol_exists(srand48 stdlib.h HAVE_RAND48_SRAND48) if( HAVE_RAND48_SRAND48 ) @@ -183,8 +162,6 @@ check_symbol_exists(strtoq stdlib.h HAVE_STRTOQ) check_symbol_exists(strerror string.h HAVE_STRERROR) check_symbol_exists(strerror_r string.h HAVE_STRERROR_R) check_symbol_exists(strerror_s string.h HAVE_DECL_STRERROR_S) -check_symbol_exists(memcpy string.h HAVE_MEMCPY) -check_symbol_exists(memmove string.h HAVE_MEMMOVE) check_symbol_exists(setenv stdlib.h HAVE_SETENV) if( PURE_WINDOWS ) check_symbol_exists(_chsize_s io.h HAVE__CHSIZE_S) @@ -208,13 +185,6 @@ if( PURE_WINDOWS ) check_function_exists(__main HAVE___MAIN) check_function_exists(__cmpdi2 HAVE___CMPDI2) endif() -if( HAVE_ARGZ_H ) - check_symbol_exists(argz_append argz.h HAVE_ARGZ_APPEND) - check_symbol_exists(argz_create_sep argz.h HAVE_ARGZ_CREATE_SEP) - check_symbol_exists(argz_insert argz.h HAVE_ARGZ_INSERT) - check_symbol_exists(argz_next argz.h HAVE_ARGZ_NEXT) - check_symbol_exists(argz_stringify argz.h HAVE_ARGZ_STRINGIFY) -endif() if( HAVE_DLFCN_H ) if( HAVE_LIBDL ) list(APPEND CMAKE_REQUIRED_LIBRARIES dl) @@ -231,10 +201,7 @@ if( LLVM_USING_GLIBC ) add_llvm_definitions( -D_GNU_SOURCE ) endif() -set(headers "") -if (HAVE_SYS_TYPES_H) - set(headers ${headers} "sys/types.h") -endif() +set(headers "sys/types.h") if (HAVE_INTTYPES_H) set(headers ${headers} "inttypes.h") diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake index a5dcc5b..98f7417 100644 --- a/include/llvm/Config/config.h.cmake +++ b/include/llvm/Config/config.h.cmake @@ -33,27 +33,6 @@ /* Define to 1 if you have the `arc4random' function. */ #cmakedefine HAVE_ARC4RANDOM -/* Define to 1 if you have the `argz_append' function. */ -#cmakedefine HAVE_ARGZ_APPEND ${HAVE_ARGZ_APPEND} - -/* Define to 1 if you have the `argz_create_sep' function. */ -#cmakedefine HAVE_ARGZ_CREATE_SEP ${HAVE_ARGZ_CREATE_SEP} - -/* Define to 1 if you have the <argz.h> header file. */ -#cmakedefine HAVE_ARGZ_H ${HAVE_ARGZ_H} - -/* Define to 1 if you have the `argz_insert' function. */ -#cmakedefine HAVE_ARGZ_INSERT ${HAVE_ARGZ_INSERT} - -/* Define to 1 if you have the `argz_next' function. */ -#cmakedefine HAVE_ARGZ_NEXT ${HAVE_ARGZ_NEXT} - -/* Define to 1 if you have the `argz_stringify' function. */ -#cmakedefine HAVE_ARGZ_STRINGIFY ${HAVE_ARGZ_STRINGIFY} - -/* Define to 1 if you have the <assert.h> header file. */ -#cmakedefine HAVE_ASSERT_H ${HAVE_ASSERT_H} - /* Define to 1 if you have the `backtrace' function. */ #cmakedefine HAVE_BACKTRACE ${HAVE_BACKTRACE} @@ -78,9 +57,6 @@ /* can use __crashreporter_info__ */ #undef HAVE_CRASHREPORTER_INFO -/* Define to 1 if you have the <ctype.h> header file. */ -#cmakedefine HAVE_CTYPE_H ${HAVE_CTYPE_H} - /* Define to 1 if you have the declaration of `strerror_s', and to 0 if you don't. */ #cmakedefine01 HAVE_DECL_STRERROR_S @@ -92,9 +68,6 @@ /* Define if you have the GNU dld library. */ #undef HAVE_DLD -/* Define to 1 if you have the <dld.h> header file. */ -#cmakedefine HAVE_DLD_H ${HAVE_DLD_H} - /* Define to 1 if you have the `dlerror' function. */ #cmakedefine HAVE_DLERROR ${HAVE_DLERROR} @@ -104,9 +77,6 @@ /* Define if dlopen() is available on this platform. */ #cmakedefine HAVE_DLOPEN ${HAVE_DLOPEN} -/* Define to 1 if you have the <dl.h> header file. */ -#cmakedefine HAVE_DL_H ${HAVE_DL_H} - /* Define if the dot program is available */ #cmakedefine HAVE_DOT ${HAVE_DOT} @@ -119,9 +89,6 @@ /* Define to 1 if you have the <errno.h> header file. */ #cmakedefine HAVE_ERRNO_H ${HAVE_ERRNO_H} -/* Define to 1 if the system has the type `error_t'. */ -#cmakedefine HAVE_ERROR_T ${HAVE_ERROR_T} - /* Define to 1 if you have the <execinfo.h> header file. */ #cmakedefine HAVE_EXECINFO_H ${HAVE_EXECINFO_H} @@ -197,9 +164,6 @@ /* Define if the gv program is available */ #cmakedefine HAVE_GV ${HAVE_GV} -/* Define to 1 if you have the `index' function. */ -#cmakedefine HAVE_INDEX ${HAVE_INDEX} - /* Define to 1 if the system has the type `int64_t'. */ #cmakedefine HAVE_INT64_T ${HAVE_INT64_T} @@ -248,9 +212,6 @@ /* Define if you can use -Wl,-export-dynamic. */ #define HAVE_LINK_EXPORT_DYNAMIC 1 -/* Define to 1 if you have the <link.h> header file. */ -#cmakedefine HAVE_LINK_H ${HAVE_LINK_H} - /* Define if you can use -Wl,-R. to pass -R. to the linker, in order to add the current directory to the dynamic linker search path. */ #undef HAVE_LINK_R @@ -276,15 +237,6 @@ /* Define to 1 if you have the `malloc_zone_statistics' function. */ #cmakedefine HAVE_MALLOC_ZONE_STATISTICS ${HAVE_MALLOC_ZONE_STATISTICS} -/* Define to 1 if you have the `memcpy' function. */ -#cmakedefine HAVE_MEMCPY ${HAVE_MEMCPY} - -/* Define to 1 if you have the `memmove' function. */ -#cmakedefine HAVE_MEMMOVE ${HAVE_MEMMOVE} - -/* Define to 1 if you have the <memory.h> header file. */ -#cmakedefine HAVE_MEMORY_H ${HAVE_MEMORY_H} - /* Define to 1 if you have the `mkdtemp' function. */ #cmakedefine HAVE_MKDTEMP ${HAVE_MKDTEMP} @@ -352,9 +304,6 @@ /* Define to 1 if you have the `realpath' function. */ #undef HAVE_REALPATH -/* Define to 1 if you have the `rindex' function. */ -#cmakedefine HAVE_RINDEX ${HAVE_RINDEX} - /* Define to 1 if you have the `rintf' function. */ #undef HAVE_RINTF @@ -373,9 +322,6 @@ /* Define to 1 if you have the `setjmp' function. */ #cmakedefine HAVE_SETJMP ${HAVE_SETJMP} -/* Define to 1 if you have the <setjmp.h> header file. */ -#cmakedefine HAVE_SETJMP_H ${HAVE_SETJMP_H} - /* Define to 1 if you have the `setrlimit' function. */ #cmakedefine HAVE_SETRLIMIT ${HAVE_SETRLIMIT} @@ -394,24 +340,12 @@ /* Define to 1 if you have the <stdint.h> header file. */ #cmakedefine HAVE_STDINT_H ${HAVE_STDINT_H} -/* Define to 1 if you have the <stdio.h> header file. */ -#cmakedefine HAVE_STDIO_H ${HAVE_STDIO_H} - -/* Define to 1 if you have the <stdlib.h> header file. */ -#cmakedefine HAVE_STDLIB_H ${HAVE_STDLIB_H} - /* Set to 1 if the std::isinf function is found in <cmath> */ #undef HAVE_STD_ISINF_IN_CMATH /* Set to 1 if the std::isnan function is found in <cmath> */ #undef HAVE_STD_ISNAN_IN_CMATH -/* Define to 1 if you have the `strchr' function. */ -#cmakedefine HAVE_STRCHR ${HAVE_STRCHR} - -/* Define to 1 if you have the `strcmp' function. */ -#cmakedefine HAVE_STRCMP ${HAVE_STRCMP} - /* Define to 1 if you have the `strdup' function. */ #cmakedefine HAVE_STRDUP ${HAVE_STRDUP} @@ -421,15 +355,6 @@ /* Define to 1 if you have the `strerror_r' function. */ #cmakedefine HAVE_STRERROR_R ${HAVE_STRERROR_R} -/* Define to 1 if you have the <strings.h> header file. */ -#cmakedefine HAVE_STRINGS_H ${HAVE_STRINGS_H} - -/* Define to 1 if you have the <string.h> header file. */ -#cmakedefine HAVE_STRING_H ${HAVE_STRING_H} - -/* Define to 1 if you have the `strrchr' function. */ -#cmakedefine HAVE_STRRCHR ${HAVE_STRRCHR} - /* Define to 1 if you have the `strtof' function. */ #cmakedefine HAVE_STRTOF ${HAVE_STRTOF} @@ -446,9 +371,6 @@ */ #cmakedefine HAVE_SYS_DIR_H ${HAVE_SYS_DIR_H} -/* Define to 1 if you have the <sys/dl.h> header file. */ -#cmakedefine HAVE_SYS_DL_H ${HAVE_SYS_DL_H} - /* Define to 1 if you have the <sys/ioctl.h> header file. */ #cmakedefine HAVE_SYS_IOCTL_H ${HAVE_SYS_IOCTL_H} @@ -501,9 +423,6 @@ /* Define to 1 if you have the <valgrind/valgrind.h> header file. */ #cmakedefine HAVE_VALGRIND_VALGRIND_H ${HAVE_VALGRIND_VALGRIND_H} -/* Define to 1 if you have the <windows.h> header file. */ -#cmakedefine HAVE_WINDOWS_H ${HAVE_WINDOWS_H} - /* Define to 1 if you have the `writev' function. */ #cmakedefine HAVE_WRITEV ${HAVE_WRITEV} diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in index 3c6b58d..ab79932 100644 --- a/include/llvm/Config/config.h.in +++ b/include/llvm/Config/config.h.in @@ -33,33 +33,9 @@ /* Define to 1 if you have the `arc4random' function. */ #undef HAVE_ARC4RANDOM -/* Define to 1 if you have the `argz_append' function. */ -#undef HAVE_ARGZ_APPEND - -/* Define to 1 if you have the `argz_create_sep' function. */ -#undef HAVE_ARGZ_CREATE_SEP - -/* Define to 1 if you have the <argz.h> header file. */ -#undef HAVE_ARGZ_H - -/* Define to 1 if you have the `argz_insert' function. */ -#undef HAVE_ARGZ_INSERT - -/* Define to 1 if you have the `argz_next' function. */ -#undef HAVE_ARGZ_NEXT - -/* Define to 1 if you have the `argz_stringify' function. */ -#undef HAVE_ARGZ_STRINGIFY - -/* Define to 1 if you have the <assert.h> header file. */ -#undef HAVE_ASSERT_H - /* Define to 1 if you have the `backtrace' function. */ #undef HAVE_BACKTRACE -/* Define to 1 if you have the `bcopy' function. */ -#undef HAVE_BCOPY - /* Define to 1 if you have the `ceilf' function. */ #undef HAVE_CEILF @@ -75,9 +51,6 @@ /* can use __crashreporter_info__ */ #undef HAVE_CRASHREPORTER_INFO -/* Define to 1 if you have the <ctype.h> header file. */ -#undef HAVE_CTYPE_H - /* Define to 1 if you have the <cxxabi.h> header file. */ #undef HAVE_CXXABI_H @@ -100,9 +73,6 @@ /* Define if you have the GNU dld library. */ #undef HAVE_DLD -/* Define to 1 if you have the <dld.h> header file. */ -#undef HAVE_DLD_H - /* Define to 1 if you have the `dlerror' function. */ #undef HAVE_DLERROR @@ -112,9 +82,6 @@ /* Define if dlopen() is available on this platform. */ #undef HAVE_DLOPEN -/* Define to 1 if you have the <dl.h> header file. */ -#undef HAVE_DL_H - /* Define if the dot program is available */ #undef HAVE_DOT @@ -238,15 +205,9 @@ /* Define to 1 if you have the `z' library (-lz). */ #undef HAVE_LIBZ -/* Define to 1 if you have the <limits.h> header file. */ -#undef HAVE_LIMITS_H - /* Define if you can use -Wl,-export-dynamic. */ #undef HAVE_LINK_EXPORT_DYNAMIC -/* Define to 1 if you have the <link.h> header file. */ -#undef HAVE_LINK_H - /* Define if you can use -Wl,-R. to pass -R. to the linker, in order to add the current directory to the dynamic linker search path. */ #undef HAVE_LINK_R @@ -281,15 +242,6 @@ /* Define to 1 if you have the `malloc_zone_statistics' function. */ #undef HAVE_MALLOC_ZONE_STATISTICS -/* Define to 1 if you have the `memcpy' function. */ -#undef HAVE_MEMCPY - -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the `mkdtemp' function. */ #undef HAVE_MKDTEMP @@ -378,9 +330,6 @@ /* Define to 1 if you have the `setjmp' function. */ #undef HAVE_SETJMP -/* Define to 1 if you have the <setjmp.h> header file. */ -#undef HAVE_SETJMP_H - /* Define to 1 if you have the `setrlimit' function. */ #undef HAVE_SETRLIMIT @@ -399,42 +348,18 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H -/* Define to 1 if you have the <stdio.h> header file. */ -#undef HAVE_STDIO_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - /* Set to 1 if the std::isinf function is found in <cmath> */ #undef HAVE_STD_ISINF_IN_CMATH /* Set to 1 if the std::isnan function is found in <cmath> */ #undef HAVE_STD_ISNAN_IN_CMATH -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the `strcmp' function. */ -#undef HAVE_STRCMP - -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - /* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR /* Define to 1 if you have the `strerror_r' function. */ #undef HAVE_STRERROR_R -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strrchr' function. */ -#undef HAVE_STRRCHR - /* Define to 1 if you have the `strtof' function. */ #undef HAVE_STRTOF @@ -451,9 +376,6 @@ */ #undef HAVE_SYS_DIR_H -/* Define to 1 if you have the <sys/dl.h> header file. */ -#undef HAVE_SYS_DL_H - /* Define to 1 if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H @@ -476,9 +398,6 @@ /* Define to 1 if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - /* Define to 1 if you have the <sys/uio.h> header file. */ #undef HAVE_SYS_UIO_H @@ -506,9 +425,6 @@ /* Define to 1 if you have the <valgrind/valgrind.h> header file. */ #undef HAVE_VALGRIND_VALGRIND_H -/* Define to 1 if you have the <windows.h> header file. */ -#undef HAVE_WINDOWS_H - /* Define to 1 if you have the `writev' function. */ #undef HAVE_WRITEV diff --git a/include/llvm/Support/DataTypes.h.cmake b/include/llvm/Support/DataTypes.h.cmake index 1dcec05..a26070c 100644 --- a/include/llvm/Support/DataTypes.h.cmake +++ b/include/llvm/Support/DataTypes.h.cmake @@ -26,7 +26,6 @@ #ifndef SUPPORT_DATATYPES_H #define SUPPORT_DATATYPES_H -#cmakedefine HAVE_SYS_TYPES_H ${HAVE_SYS_TYPES_H} #cmakedefine HAVE_INTTYPES_H ${HAVE_INTTYPES_H} #cmakedefine HAVE_STDINT_H ${HAVE_STDINT_H} #cmakedefine HAVE_UINT64_T ${HAVE_UINT64_T} @@ -54,9 +53,7 @@ #endif /* Note that <inttypes.h> includes <stdint.h>, if this is a C99 system. */ -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #ifdef HAVE_INTTYPES_H #include <inttypes.h> diff --git a/include/llvm/Support/DataTypes.h.in b/include/llvm/Support/DataTypes.h.in index dca304e..7fc9b72 100644 --- a/include/llvm/Support/DataTypes.h.in +++ b/include/llvm/Support/DataTypes.h.in @@ -26,7 +26,6 @@ #ifndef SUPPORT_DATATYPES_H #define SUPPORT_DATATYPES_H -#undef HAVE_SYS_TYPES_H #undef HAVE_INTTYPES_H #undef HAVE_STDINT_H #undef HAVE_UINT64_T @@ -54,9 +53,7 @@ #endif /* Note that <inttypes.h> includes <stdint.h>, if this is a C99 system. */ -#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -#endif #ifdef HAVE_INTTYPES_H #include <inttypes.h> diff --git a/lib/Support/Errno.cpp b/lib/Support/Errno.cpp index 730220f..ed17f60 100644 --- a/lib/Support/Errno.cpp +++ b/lib/Support/Errno.cpp @@ -14,8 +14,6 @@ #include "llvm/Support/Errno.h" #include "llvm/Config/config.h" // Get autoconf configuration settings #include "llvm/Support/raw_ostream.h" - -#if HAVE_STRING_H #include <string.h> #if HAVE_ERRNO_H @@ -75,5 +73,3 @@ std::string StrError(int errnum) { } // namespace sys } // namespace llvm - -#endif // HAVE_STRING_H diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc index ccd60e5..5386366 100644 --- a/lib/Support/Unix/Path.inc +++ b/lib/Support/Unix/Path.inc @@ -18,6 +18,8 @@ #include "Unix.h" #include "llvm/Support/Process.h" +#include <limits.h> +#include <stdio.h> #if HAVE_SYS_STAT_H #include <sys/stat.h> #endif @@ -43,12 +45,6 @@ # include <ndir.h> # endif #endif -#if HAVE_STDIO_H -#include <stdio.h> -#endif -#if HAVE_LIMITS_H -#include <limits.h> -#endif #ifdef __APPLE__ #include <mach-o/dyld.h> diff --git a/lib/Support/Unix/Unix.h b/lib/Support/Unix/Unix.h index 051f56f..dd11c04 100644 --- a/lib/Support/Unix/Unix.h +++ b/lib/Support/Unix/Unix.h @@ -22,28 +22,22 @@ #include "llvm/Config/config.h" // Get autoconf configuration settings #include "llvm/Support/Errno.h" #include <algorithm> +#include <assert.h> #include <cerrno> #include <cstdio> #include <cstdlib> #include <cstring> #include <string> +#include <sys/types.h> #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif - #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif -#ifdef HAVE_ASSERT_H -#include <assert.h> -#endif - #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif |