diff options
| author | John Criswell <criswell@uiuc.edu> | 2003-06-30 21:59:07 +0000 |
|---|---|---|
| committer | John Criswell <criswell@uiuc.edu> | 2003-06-30 21:59:07 +0000 |
| commit | 7a73b80b9052136c8cd2234eb3433a07df7cf38e (patch) | |
| tree | f7be65b4a1f3c25d8f5dfc42f6ea73f7bbfec00d /lib/ExecutionEngine | |
| parent | eb093fbf6fd2878c842f2f215362597475ef1817 (diff) | |
| download | llvm-7a73b80b9052136c8cd2234eb3433a07df7cf38e.tar.gz llvm-7a73b80b9052136c8cd2234eb3433a07df7cf38e.tar.bz2 llvm-7a73b80b9052136c8cd2234eb3433a07df7cf38e.tar.xz | |
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
Diffstat (limited to 'lib/ExecutionEngine')
| -rw-r--r-- | lib/ExecutionEngine/ExecutionEngine.cpp | 2 | ||||
| -rw-r--r-- | lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp | 6 | ||||
| -rw-r--r-- | lib/ExecutionEngine/JIT/Intercept.cpp | 2 | ||||
| -rw-r--r-- | lib/ExecutionEngine/JIT/JITEmitter.cpp | 3 | ||||
| -rw-r--r-- | lib/ExecutionEngine/Makefile | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp index 1750b58d3d..532f8fd49b 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 941160ca5f..b171affd1c 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 36eca30af0..ba49bbde05 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 4ef78a54b9..506da118c5 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 void *getMemory(unsigned NumPages) { 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 6ee2d3f3ab..d74adf9492 100644 --- a/lib/ExecutionEngine/Makefile +++ b/lib/ExecutionEngine/Makefile @@ -3,7 +3,7 @@ TOOLNAME = lli PARALLEL_DIRS = Interpreter JIT # Get the config name... -include $(LEVEL)/Makefile.$(shell uname) +include $(LEVEL)/Makefile.config # Generic JIT libraries JITLIBS = lli-jit codegen |