Firm inplace edges are needed for the firm backend and cannot be switched off anymore

[r7793]

diff --git a/config.h.in b/config.h.in
index 9ea1783..9df7894 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -107,9 +107,6 @@
 /* undef to disable inlining */
 #undef USE_INLINING
 
-/* Define to 1 if Firm inplace edges are activated */
-#undef FIRM_EDGES_INPLACE
-
 /* Define to 1 if Firm hooks are activated */
 #undef FIRM_ENABLE_HOOKS
 

diff --git a/configure b/configure
index 395c0d4..4dbfb77 100755 (executable)
--- a/configure
+++ b/configure
@@ -850,10 +850,9 @@ Optional Features:
   --enable-heapanalysis   Compile with heap analysis.
   --disable-libiberty     disable own libiberty parts
   --disable-hooks         disable Firm hooks
-  --disable-inplace-edges disable Firm inplace edges
   --enable-statistics     enable Firm statistics
   --enable-libcore        enable libcore debugging
-  --enable-ilp        enable ilp solver
+  --enable-ilp            enable ilp solver
   --enable-wchar-support  enable wchar_t support for identifiers (needed for java)
   --disable-external-effects  disable descriptions of external effects in XML
 
@@ -1545,23 +1544,6 @@ else
 _ACEOF
 
 
-fi;
-
-# Check whether --enable-inplace_edges or --disable-inplace_edges was given.
-if test "${enable_inplace_edges+set}" = set; then
-  enableval="$enable_inplace_edges"
-  if test "$enableval" = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define FIRM_EDGES_INPLACE 1
-_ACEOF
-
-fi
-else
-  cat >>confdefs.h <<\_ACEOF
-#define FIRM_EDGES_INPLACE 1
-_ACEOF
-
-
 fi;
 
 # Check whether --enable-statistics or --disable-statistics was given.

diff --git a/configure.in b/configure.in
index 1928cbf..eaeb9e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -169,16 +169,6 @@ fi],
 AC_DEFINE(FIRM_ENABLE_HOOKS)
 )
 
-dnl enable Firm inplace edges
-dnl -------------
-AC_ARG_ENABLE(inplace_edges,
-[  --disable-inplace-edges disable Firm inplace edges],
-[if test "$enableval" = yes; then
-  AC_DEFINE(FIRM_EDGES_INPLACE)
-fi],
-AC_DEFINE(FIRM_EDGES_INPLACE)
-)
-
 dnl enable Firm statistics
 dnl -------------
 AC_ARG_ENABLE(statistics,
@@ -200,7 +190,7 @@ AC_SUBST(enable_libcore)
 dnl enable ILP solver support
 dnl --------------------------------
 AC_ARG_ENABLE(ilp,
-[  --enable-ilp        enable ilp solver],
+[  --enable-ilp            enable ilp solver],
 [if test "$enableval"=yes; then
   AC_DEFINE(WITH_ILP)
 fi])

diff --git a/win32/config.h b/win32/config.h
index a22a9bb..082e530 100644 (file)
--- a/win32/config.h
+++ b/win32/config.h
@@ -109,9 +109,6 @@
 /* Define to 1 if Firm hooks are activated */
 #define FIRM_ENABLE_HOOKS 1
 
-/* Define to 1 if Firm inplace edges are activated */
-#define FIRM_EDGES_INPLACE 1
-
 /* Define the right volatile token */
 /* #undef volatile */
 

diff --git a/win32/firm_config.h b/win32/firm_config.h
index 8731236..83afb6d 100644 (file)
--- a/win32/firm_config.h
+++ b/win32/firm_config.h
@@ -58,11 +58,6 @@
 #define FIRM_ENABLE_HOOKS 1
 #endif
 
-/* Define to 1 if Firm inplace edges are activated */
-#ifndef FIRM_EDGES_INPLACE
-#define FIRM_EDGES_INPLACE 1
-#endif
-
 #ifdef USE_INLINING
 #ifndef INLINE
 #define INLINE  __inline