Index: polly/trunk/autoconf/configure.ac
===================================================================
--- polly/trunk/autoconf/configure.ac
+++ polly/trunk/autoconf/configure.ac
@@ -100,7 +100,7 @@
 AC_CONFIG_COMMANDS_POST([
   dnl Configure ISL with small integer optimization, but do not add the
   dnl option to config.status as it is mandatory for Polly.
-  ac_configure_args="$ac_configure_args --with-int=imath"
+  ac_configure_args="$ac_configure_args --with-int=imath-32"
 ])
 
 dnl This must be last
Index: polly/trunk/configure
===================================================================
--- polly/trunk/configure
+++ polly/trunk/configure
@@ -3763,7 +3763,7 @@
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
-      ac_configure_args="$ac_configure_args --with-int=imath"
+      ac_configure_args="$ac_configure_args --with-int=imath-32"
 
 
 # configure is writing to config.log, and then calls config.status.
Index: polly/trunk/lib/CMakeLists.txt
===================================================================
--- polly/trunk/lib/CMakeLists.txt
+++ polly/trunk/lib/CMakeLists.txt
@@ -40,7 +40,7 @@
 # Enable small integer optimization and imath
 set(USE_GMP_FOR_MP OFF)
 set(USE_IMATH_FOR_MP ON)
-set(USE_SMALL_INT_OPT OFF)
+set(USE_SMALL_INT_OPT ON)
 
 # Determine compiler characteristics
 include(CheckCSourceCompiles)
@@ -112,6 +112,7 @@
     External/isl/isl_ilp.c
     External/isl/isl_imath.c
     External/isl/isl_input.c
+    External/isl/isl_int_sioimath.c
     External/isl/isl_local_space.c
     External/isl/isl_lp.c
     External/isl/isl_map.c
@@ -148,7 +149,7 @@
     External/isl/isl_transitive_closure.c
     External/isl/isl_union_map.c
     External/isl/isl_val.c
-    External/isl/isl_val_imath.c
+    External/isl/isl_val_sioimath.c
     External/isl/isl_vec.c
     External/isl/isl_version.c
     External/isl/isl_vertices.c
Index: polly/trunk/lib/Makefile
===================================================================
--- polly/trunk/lib/Makefile
+++ polly/trunk/lib/Makefile
@@ -61,6 +61,7 @@
            External/isl/isl_ilp.c \
            External/isl/isl_imath.c \
            External/isl/isl_input.c \
+           External/isl/isl_int_sioimath.c \
            External/isl/isl_local_space.c \
            External/isl/isl_lp.c \
            External/isl/isl_map.c \
@@ -97,7 +98,7 @@
            External/isl/isl_transitive_closure.c \
            External/isl/isl_union_map.c \
            External/isl/isl_val.c \
-           External/isl/isl_val_imath.c \
+           External/isl/isl_val_sioimath.c \
            External/isl/isl_vec.c \
            External/isl/isl_version.c \
            External/isl/isl_vertices.c \