revert r78628 and r78803 as these are not needed any more

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80048 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c1e6fcee63a3bc4f25972fffdd2b5a66f62dd2a..c6036f02bd02fc62fe0e34e10274a01ae57dcfd0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,12 +94,6 @@ else()
   endif()
 endif()
 
-if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND NOT LLVM_ENABLE_ASSERTIONS )
-  set( LLVM_COMPACT_SENTINELS 1 )
-else( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND NOT LLVM_ENABLE_ASSERTIONS )
-  set( LLVM_COMPACT_SENTINELS 0 )
-endif( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND NOT LLVM_ENABLE_ASSERTIONS )
-
 if( LLVM_TARGETS_TO_BUILD STREQUAL "all" )
   set( LLVM_TARGETS_TO_BUILD ${LLVM_ALL_TARGETS} )
 endif()

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 22e4076a0263386a7e65a511544d69bbdd4ea8f2..173341a054cfec40a334ecaa0ec454b3d4644780 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -361,17 +361,6 @@ else
   AC_SUBST(DISABLE_ASSERTIONS,[[DISABLE_ASSERTIONS=1]])
 fi
 
-dnl LLVM_COMPACT_SENTINELS : can be used to shrink ilist's end iterators and disable certain checks on them:
-if test ${ENABLE_OPTIMIZED},${DISABLE_ASSERTIONS} = "ENABLE_OPTIMIZED=1,DISABLE_ASSERTIONS=1" ; then
-  AC_SUBST(LLVM_COMPACT_SENTINELS,[1])
-else
-  AC_SUBST(LLVM_COMPACT_SENTINELS,[0])
-fi
-
-AC_DEFINE_UNQUOTED([LLVM_COMPACT_SENTINELS],$LLVM_COMPACT_SENTINELS,
-                   [Define to 1 for ilist sentinel compaction])
-
-
 dnl --enable-expensive-checks : check whether they want to turn on expensive debug checks:
 AC_ARG_ENABLE(expensive-checks,AS_HELP_STRING(
   --enable-expensive-checks,[Compile with expensive debug checks enabled (default is NO)]),, enableval="no")

diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index 626da4d91c254decd1beeb2a0df47c2c0f08ce8a..360ca5d9c1fbaf358cd0ce95beb9f47c97b9017c 100644 (file)
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -425,9 +425,6 @@
 /* Define to 1 if you have the <windows.h> header file. */
 #cmakedefine HAVE_WINDOWS_H ${HAVE_WINDOWS_H}
 
-/* Define to 1 for ilist sentinel compaction */
-#cmakedefine LLVM_COMPACT_SENTINELS ${LLVM_COMPACT_SENTINELS}
-
 /* Installation directory for binary executables */
 #undef LLVM_BINDIR