Index: llvm/trunk/llvm-Config-config.h
===================================================================
--- llvm/trunk/llvm-Config-config.h	(revision 168979)
+++ llvm/trunk/llvm-Config-config.h	(working copy)
@@ -1,7 +1,11 @@
 #include <bits/wordsize.h>
 
 #if __WORDSIZE == 32
+#if defined __x86_64__ && defined __ILP32__
+#include "config-x32.h"
+#else
 #include "config-32.h"
+#endif
 #elif __WORDSIZE == 64
 #include "config-64.h"
 #else
Index: llvm/trunk/llvm-Config-llvm-config.h
===================================================================
--- llvm/trunk/llvm-Config-llvm-config.h	(revision 168979)
+++ llvm/trunk/llvm-Config-llvm-config.h	(working copy)
@@ -1,7 +1,11 @@
 #include <bits/wordsize.h>
 
 #if __WORDSIZE == 32
+#if defined __x86_64__ && defined __ILP32__
+#include "llvm-config-x32.h"
+#else
 #include "llvm-config-32.h"
+#endif
 #elif __WORDSIZE == 64
 #include "llvm-config-64.h"
 #else