Index: CMakeLists.txt =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -744,9 +744,6 @@ configure_file( ${LLVM_MAIN_INCLUDE_DIR}/llvm/Config/abi-breaking.h.cmake ${LLVM_INCLUDE_DIR}/llvm/Config/abi-breaking.h) -configure_file( - ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/DataTypes.h.cmake - ${LLVM_INCLUDE_DIR}/llvm-c/DataTypes.h) # Add target for generating source rpm package. set(LLVM_SRPM_USER_BINARY_SPECFILE ${CMAKE_CURRENT_SOURCE_DIR}/llvm.spec.in Index: cmake/config-ix.cmake =================================================================== --- cmake/config-ix.cmake +++ cmake/config-ix.cmake @@ -25,30 +25,11 @@ list(APPEND CMAKE_REQUIRED_LIBRARIES "cxxrt") endif() -# Helper macros and functions -macro(add_cxx_include result files) - set(${result} "") - foreach (file_name ${files}) - set(${result} "${${result}}#include<${file_name}>\n") - endforeach() -endmacro(add_cxx_include files result) - -function(check_type_exists type files variable) - add_cxx_include(includes "${files}") - CHECK_CXX_SOURCE_COMPILES(" - ${includes} ${type} typeVar; - int main() { - return 0; - } - " ${variable}) -endfunction() - # include checks check_include_file(dirent.h HAVE_DIRENT_H) check_include_file(dlfcn.h HAVE_DLFCN_H) check_include_file(errno.h HAVE_ERRNO_H) check_include_file(fcntl.h HAVE_FCNTL_H) -check_include_file(inttypes.h HAVE_INTTYPES_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) @@ -57,7 +38,6 @@ check_include_file(pthread.h HAVE_PTHREAD_H) endif() check_include_file(signal.h HAVE_SIGNAL_H) -check_include_file(stdint.h HAVE_STDINT_H) check_include_file(sys/dir.h HAVE_SYS_DIR_H) check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H) check_include_file(sys/mman.h HAVE_SYS_MMAN_H) @@ -294,20 +274,6 @@ check_library_exists(c pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP) endif() -set(headers "sys/types.h") - -if (HAVE_INTTYPES_H) - set(headers ${headers} "inttypes.h") -endif() - -if (HAVE_STDINT_H) - set(headers ${headers} "stdint.h") -endif() - -check_type_exists(int64_t "${headers}" HAVE_INT64_T) -check_type_exists(uint64_t "${headers}" HAVE_UINT64_T) -check_type_exists(u_int64_t "${headers}" HAVE_U_INT64_T) - # available programs checks function(llvm_find_program name) string(TOUPPER ${name} NAME) Index: include/llvm-c/DataTypes.h =================================================================== --- include/llvm-c/DataTypes.h +++ include/llvm-c/DataTypes.h @@ -24,34 +24,14 @@ #ifndef LLVM_C_DATATYPES_H #define LLVM_C_DATATYPES_H -#cmakedefine HAVE_INTTYPES_H ${HAVE_INTTYPES_H} -#cmakedefine HAVE_STDINT_H ${HAVE_STDINT_H} -#cmakedefine HAVE_UINT64_T ${HAVE_UINT64_T} -#cmakedefine HAVE_U_INT64_T ${HAVE_U_INT64_T} - #ifdef __cplusplus #include #else #include #endif -#ifdef __cplusplus -#include -#else -#ifdef HAVE_INTTYPES_H #include -#endif -#endif - -#ifdef __cplusplus -#include -#else -#ifdef HAVE_STDINT_H #include -#else -#error "Compiler must provide an implementation of stdint.h" -#endif -#endif #ifndef _MSC_VER @@ -74,15 +54,6 @@ #undef INT64_MIN #endif -/* Handle incorrect definition of uint64_t as u_int64_t */ -#ifndef HAVE_UINT64_T -#ifdef HAVE_U_INT64_T -typedef u_int64_t uint64_t; -#else -# error "Don't have a definition for uint64_t on this platform" -#endif -#endif - #else /* _MSC_VER */ #ifdef __cplusplus #include @@ -99,22 +70,6 @@ typedef signed int ssize_t; #endif /* _WIN64 */ -#ifndef HAVE_INTTYPES_H -#define PRId64 "I64d" -#define PRIi64 "I64i" -#define PRIo64 "I64o" -#define PRIu64 "I64u" -#define PRIx64 "I64x" -#define PRIX64 "I64X" - -#define PRId32 "d" -#define PRIi32 "i" -#define PRIo32 "o" -#define PRIu32 "u" -#define PRIx32 "x" -#define PRIX32 "X" -#endif /* HAVE_INTTYPES_H */ - #endif /* _MSC_VER */ /* Set defaults for constants which we cannot find. */ Index: include/llvm-c/DataTypes.h.cmake =================================================================== --- include/llvm-c/DataTypes.h.cmake +++ include/llvm-c/DataTypes.h.cmake @@ -1,135 +0,0 @@ -/*===-- include/llvm-c/DataTypes.h - Define fixed size types ------*- C -*-===*\ -|* *| -|* The LLVM Compiler Infrastructure *| -|* *| -|* This file is distributed under the University of Illinois Open Source *| -|* License. See LICENSE.TXT for details. *| -|* *| -|*===----------------------------------------------------------------------===*| -|* *| -|* This file contains definitions to figure out the size of _HOST_ data types.*| -|* This file is important because different host OS's define different macros,*| -|* which makes portability tough. This file exports the following *| -|* definitions: *| -|* *| -|* [u]int(32|64)_t : typedefs for signed and unsigned 32/64 bit system types*| -|* [U]INT(8|16|32|64)_(MIN|MAX) : Constants for the min and max values. *| -|* *| -|* No library is required when using these functions. *| -|* *| -|*===----------------------------------------------------------------------===*/ - -/* Please leave this file C-compatible. */ - -#ifndef LLVM_C_DATATYPES_H -#define LLVM_C_DATATYPES_H - -#cmakedefine HAVE_INTTYPES_H ${HAVE_INTTYPES_H} -#cmakedefine HAVE_STDINT_H ${HAVE_STDINT_H} -#cmakedefine HAVE_UINT64_T ${HAVE_UINT64_T} -#cmakedefine HAVE_U_INT64_T ${HAVE_U_INT64_T} - -#ifdef __cplusplus -#include -#else -#include -#endif - -#ifdef __cplusplus -#include -#else -#ifdef HAVE_INTTYPES_H -#include -#endif -#endif - -#ifdef __cplusplus -#include -#else -#ifdef HAVE_STDINT_H -#include -#else -#error "Compiler must provide an implementation of stdint.h" -#endif -#endif - -#ifndef _MSC_VER - -#if !defined(UINT32_MAX) -# error "The standard header is not C++11 compliant. Must #define "\ - "__STDC_LIMIT_MACROS before #including llvm-c/DataTypes.h" -#endif - -#if !defined(UINT32_C) -# error "The standard header is not C++11 compliant. Must #define "\ - "__STDC_CONSTANT_MACROS before #including llvm-c/DataTypes.h" -#endif - -/* Note that includes , if this is a C99 system. */ -#include - -#ifdef _AIX -// GCC is strict about defining large constants: they must have LL modifier. -#undef INT64_MAX -#undef INT64_MIN -#endif - -/* Handle incorrect definition of uint64_t as u_int64_t */ -#ifndef HAVE_UINT64_T -#ifdef HAVE_U_INT64_T -typedef u_int64_t uint64_t; -#else -# error "Don't have a definition for uint64_t on this platform" -#endif -#endif - -#else /* _MSC_VER */ -#ifdef __cplusplus -#include -#include -#else -#include -#include -#endif -#include - -#if defined(_WIN64) -typedef signed __int64 ssize_t; -#else -typedef signed int ssize_t; -#endif /* _WIN64 */ - -#ifndef HAVE_INTTYPES_H -#define PRId64 "I64d" -#define PRIi64 "I64i" -#define PRIo64 "I64o" -#define PRIu64 "I64u" -#define PRIx64 "I64x" -#define PRIX64 "I64X" - -#define PRId32 "d" -#define PRIi32 "i" -#define PRIo32 "o" -#define PRIu32 "u" -#define PRIx32 "x" -#define PRIX32 "X" -#endif /* HAVE_INTTYPES_H */ - -#endif /* _MSC_VER */ - -/* Set defaults for constants which we cannot find. */ -#if !defined(INT64_MAX) -# define INT64_MAX 9223372036854775807LL -#endif -#if !defined(INT64_MIN) -# define INT64_MIN ((-INT64_MAX)-1) -#endif -#if !defined(UINT64_MAX) -# define UINT64_MAX 0xffffffffffffffffULL -#endif - -#ifndef HUGE_VALF -#define HUGE_VALF (float)HUGE_VAL -#endif - -#endif /* LLVM_C_DATATYPES_H */ Index: include/llvm/Config/config.h.cmake =================================================================== --- include/llvm/Config/config.h.cmake +++ include/llvm/Config/config.h.cmake @@ -95,9 +95,6 @@ /* Define to 1 if you have the `gettimeofday' function. */ #cmakedefine HAVE_GETTIMEOFDAY ${HAVE_GETTIMEOFDAY} -/* Define to 1 if the system has the type `int64_t'. */ -#cmakedefine HAVE_INT64_T ${HAVE_INT64_T} - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_INTTYPES_H ${HAVE_INTTYPES_H} @@ -262,15 +259,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_TERMIOS_H ${HAVE_TERMIOS_H} -/* Define to 1 if the system has the type `uint64_t'. */ -#cmakedefine HAVE_UINT64_T ${HAVE_UINT64_T} - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UNISTD_H ${HAVE_UNISTD_H} -/* Define to 1 if the system has the type `u_int64_t'. */ -#cmakedefine HAVE_U_INT64_T ${HAVE_U_INT64_T} - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_VALGRIND_VALGRIND_H ${HAVE_VALGRIND_VALGRIND_H}