From daf69ac2b2a87198f811eab02d650824af4e0f51 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Wed, 21 Mar 2018 13:28:37 +0000 Subject: [PATCH] Revert "Move DataTypes.h from Support to llvm-c to fix layering." This reverts r328065. I missed this one in r328085 and the bots were still failing. llvm-svn: 328095 --- llvm/CMakeLists.txt | 4 ++-- llvm/include/llvm/Support/DataTypes.h | 17 ----------------- llvm/include/{llvm-c => llvm/Support}/DataTypes.h.cmake | 12 ++++++------ 3 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 llvm/include/llvm/Support/DataTypes.h rename llvm/include/{llvm-c => llvm/Support}/DataTypes.h.cmake (92%) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index aebf7f7..3e40d7e 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -745,8 +745,8 @@ 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) + ${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/DataTypes.h.cmake + ${LLVM_INCLUDE_DIR}/llvm/Support/DataTypes.h) # Add target for generating source rpm package. set(LLVM_SRPM_USER_BINARY_SPECFILE ${CMAKE_CURRENT_SOURCE_DIR}/llvm.spec.in diff --git a/llvm/include/llvm/Support/DataTypes.h b/llvm/include/llvm/Support/DataTypes.h deleted file mode 100644 index ad60a5b..0000000 --- a/llvm/include/llvm/Support/DataTypes.h +++ /dev/null @@ -1,17 +0,0 @@ -//===-- llvm/Support/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. -// -//===----------------------------------------------------------------------===// -// -// Due to layering constraints (Support depends on llvm-c) this is a thin -// wrapper around the implementation that lives in llvm-c, though most clients -// can/should think of this as being provided by Support for simplicity (not -// many clients are aware of their dependency on llvm-c). -// -//===----------------------------------------------------------------------===// - -#include "llvm-c/DataTypes.h" diff --git a/llvm/include/llvm-c/DataTypes.h.cmake b/llvm/include/llvm/Support/DataTypes.h.cmake similarity index 92% rename from llvm/include/llvm-c/DataTypes.h.cmake rename to llvm/include/llvm/Support/DataTypes.h.cmake index 19799ef..a58e2e4 100644 --- a/llvm/include/llvm-c/DataTypes.h.cmake +++ b/llvm/include/llvm/Support/DataTypes.h.cmake @@ -1,4 +1,4 @@ -/*===-- include/llvm-c/DataTypes.h - Define fixed size types ------*- C -*-===*\ +/*===-- include/Support/DataTypes.h - Define fixed size types -----*- C -*-===*\ |* *| |* The LLVM Compiler Infrastructure *| |* *| @@ -21,8 +21,8 @@ /* Please leave this file C-compatible. */ -#ifndef LLVM_C_DATATYPES_H -#define LLVM_C_DATATYPES_H +#ifndef SUPPORT_DATATYPES_H +#define SUPPORT_DATATYPES_H #cmakedefine HAVE_INTTYPES_H ${HAVE_INTTYPES_H} #cmakedefine HAVE_STDINT_H ${HAVE_STDINT_H} @@ -57,12 +57,12 @@ #if !defined(UINT32_MAX) # error "The standard header is not C++11 compliant. Must #define "\ - "__STDC_LIMIT_MACROS before #including llvm-c/DataTypes.h" + "__STDC_LIMIT_MACROS before #including Support/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" + "__STDC_CONSTANT_MACROS before #including Support/DataTypes.h" #endif /* Note that includes , if this is a C99 system. */ @@ -132,4 +132,4 @@ typedef signed int ssize_t; #define HUGE_VALF (float)HUGE_VAL #endif -#endif /* LLVM_C_DATATYPES_H */ +#endif /* SUPPORT_DATATYPES_H */ -- 2.7.4