diff options
| -rw-r--r-- | Makefile.common | 3 | ||||
| -rw-r--r-- | runtime/Intrinsic/Makefile | 15 | ||||
| -rw-r--r-- | runtime/POSIX/Makefile | 2 | ||||
| -rwxr-xr-x | runtime/klee-libc/Makefile | 15 |
4 files changed, 27 insertions, 8 deletions
diff --git a/Makefile.common b/Makefile.common index 80e6e8a1..05a8e682 100644 --- a/Makefile.common +++ b/Makefile.common @@ -5,7 +5,8 @@ include $(LEVEL)/Makefile.config # Include LLVM's Master Makefile config and rules. include $(LLVM_OBJ_ROOT)/Makefile.config -ifeq ($(BYTECODE_LIBRARY), 1) +BUILDING_RUNTIME:=$(if $(or $(BYTECODE_LIBRARY),$(MODULE_NAME)),1,0) +ifeq ($(BUILDING_RUNTIME),1) # # Override make variables based on the runtime configuration. We want # to override whatever the user may have said on the command line, diff --git a/runtime/Intrinsic/Makefile b/runtime/Intrinsic/Makefile index 3c6b01b3..49f8f9cc 100644 --- a/runtime/Intrinsic/Makefile +++ b/runtime/Intrinsic/Makefile @@ -9,15 +9,24 @@ LEVEL=../.. +# Needed for LLVM version +include $(LEVEL)/Makefile.config + +ifeq ($(shell python -c "print($(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR) >= 3.3)"), True) +# For these versions of LLVM KLEE expects kleeRuntimeIntrinsic to be a LLVM module rather than an archive +MODULE_NAME=kleeRuntimeIntrinsic +else +# KLEE built against older versions of LLVM expects a library archive instead +BYTECODE_LIBRARY=1 LIBRARYNAME=kleeRuntimeIntrinsic +endif + DONT_BUILD_RELINKED=1 -BUILD_ARCHIVE=1 -BYTECODE_LIBRARY=1 # Don't strip debug info from the module. DEBUG_RUNTIME=1 NO_PEDANTIC=1 +NO_BUILD_ARCHIVE=1 -MODULE_NAME=kleeRuntimeIntrinsic C.Flags += -fno-builtin include $(LEVEL)/Makefile.common diff --git a/runtime/POSIX/Makefile b/runtime/POSIX/Makefile index 9a42f5c0..1e570098 100644 --- a/runtime/POSIX/Makefile +++ b/runtime/POSIX/Makefile @@ -11,10 +11,10 @@ LEVEL=../.. LIBRARYNAME=kleeRuntimePOSIX DONT_BUILD_RELINKED=1 -BUILD_ARCHIVE=1 BYTECODE_LIBRARY=1 # Don't strip debug info from the module. DEBUG_RUNTIME=1 NO_PEDANTIC=1 +NO_BUILD_ARCHIVE=1 include $(LEVEL)/Makefile.common diff --git a/runtime/klee-libc/Makefile b/runtime/klee-libc/Makefile index eca63169..d059ba8a 100755 --- a/runtime/klee-libc/Makefile +++ b/runtime/klee-libc/Makefile @@ -9,14 +9,23 @@ LEVEL=../.. -LIBRARYNAME=klee-libc +# Needed for LLVM version +include $(LEVEL)/Makefile.config + +ifeq ($(shell python -c "print($(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR) >= 3.3)"), True) +# For these versions of LLVM KLEE expects klee-libc to be a LLVM module rather than an archive MODULE_NAME=klee-libc -#DONT_BUILD_RELINKED=1 +else +# KLEE built against older versions of LLVM expect a library archive instead BYTECODE_LIBRARY=1 -MODULE_NAME=klee-libc +LIBRARYNAME=klee-libc +endif + +#DONT_BUILD_RELINKED=1 # Don't strip debug info from the module. DEBUG_RUNTIME=1 #NO_PEDANTIC=1 +NO_BUILD_ARCHIVE=1 # Add __NO_INLINE__ to prevent glibc from using inline definitions of some # builtins. |