Merged in autoconf branch. This provides configuration via the autoconf
system.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7014 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp
index 1750b58..532f8fd 100644
--- a/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -12,7 +12,7 @@
#include "llvm/Module.h"
#include "llvm/Target/TargetData.h"
#include "Support/Statistic.h"
-#include <dlfcn.h>
+#include "Config/dlfcn.h"
Statistic<> NumInitBytes("lli", "Number of bytes of global vars initialized");
diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
index 941160c..b171aff 100644
--- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
+++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
@@ -17,10 +17,10 @@
#include "llvm/SymbolTable.h"
#include "llvm/Target/TargetData.h"
#include <map>
-#include <dlfcn.h>
-#include <link.h>
+#include "Config/dlfcn.h"
+#include "Config/link.h"
#include <cmath>
-#include <stdio.h>
+#include "Config/stdio.h"
using std::vector;
typedef GenericValue (*ExFunc)(FunctionType *, const vector<GenericValue> &);
diff --git a/lib/ExecutionEngine/JIT/Intercept.cpp b/lib/ExecutionEngine/JIT/Intercept.cpp
index 36eca30..ba49bbd 100644
--- a/lib/ExecutionEngine/JIT/Intercept.cpp
+++ b/lib/ExecutionEngine/JIT/Intercept.cpp
@@ -9,7 +9,7 @@
//===----------------------------------------------------------------------===//
#include "VM.h"
-#include <dlfcn.h> // dlsym access
+#include "Config/dlfcn.h" // dlsym access
#include <iostream>
// AtExitList - List of functions registered with the at_exit function
diff --git a/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp
index 4ef78a5..506da11 100644
--- a/lib/ExecutionEngine/JIT/JITEmitter.cpp
+++ b/lib/ExecutionEngine/JIT/JITEmitter.cpp
@@ -6,6 +6,7 @@
//===----------------------------------------------------------------------===//
#include "VM.h"
+#include "Config/sys/mman.h"
#include "llvm/CodeGen/MachineCodeEmitter.h"
#include "llvm/CodeGen/MachineFunction.h"
#include "llvm/CodeGen/MachineConstantPool.h"
@@ -82,7 +83,7 @@
static unsigned long Counter = 0;
pa = mmap((void*)(0x140000000UL+Counter), pageSize*NumPages,
PROT_READ|PROT_WRITE|PROT_EXEC,
- MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0); /* fd = -1 */
+ MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0); /* fd = -1 */
Counter += pageSize*NumPages;
#else
std::cerr << "This architecture is not supported by the JIT\n";
diff --git a/lib/ExecutionEngine/Makefile b/lib/ExecutionEngine/Makefile
index 6ee2d3f..d74adf9 100644
--- a/lib/ExecutionEngine/Makefile
+++ b/lib/ExecutionEngine/Makefile
@@ -3,7 +3,7 @@
PARALLEL_DIRS = Interpreter JIT
# Get the config name...
-include $(LEVEL)/Makefile.$(shell uname)
+include $(LEVEL)/Makefile.config
# Generic JIT libraries
JITLIBS = lli-jit codegen