Merge pull request travitch#97 from SRI-CSL/master

version 1.2.8

Author: ianamason

Makefile

@@ -35,7 +35,7 @@ dist: clean
 #publish: dist
 #	python setup.py sdist upload
 
-publish:
+publish: dist
 	python3 -m twine upload dist/*
 
 

README.md

@@ -251,6 +251,14 @@ cross-compiling you must ensure to use the appropriate `objcopy` for the target
 architecture. The `BINUTILS_TARGET_PREFIX` environment variable can be used to
 set the objcopy of choice, for example, `arm-linux-gnueabihf`.
 
+LTO Support
+-----------
+
+In some situations it is desirable to pass certain flags to clang in the step that
+produces the bitcode. This can be fulfilled by setting the 
+`LLVM_BITCODE_GENERATION_FLAGS` environment variable to the desired 
+flags, for example `"-flto -fwhole-program-vtables"`.
+
 Debugging
 ---------
 

wllvm/compilers.py

@@ -200,9 +200,18 @@ def getCommand(self):
 
 
 class ClangBuilder(BuilderBase):
+
+    def getBitcodeGenerationFlags(self):
+        # iam: If the environment variable LLVM_BITCODE_GENERATION_FLAGS is set we will add them to the
+        # bitcode generation step
+        bitcodeFLAGS  = os.getenv('LLVM_BITCODE_GENERATION_FLAGS')
+        if bitcodeFLAGS:
+            return bitcodeFLAGS.split()
+        return []
+
     def getBitcodeCompiler(self):
         cc = self.getCompiler()
-        return cc + ['-emit-llvm']
+        return cc + ['-emit-llvm'] + self.getBitcodeGenerationFlags()
 
     def getCompiler(self):
         if self.mode == "wllvm++":

wllvm/version.py

@@ -74,8 +74,12 @@
 
 1.2.5    - 4/17/2019 Fixing the pip package, hopefully.
 
-1.2.6    - 6/18/2019 Various compiler cmd line options parsing tweaks."
+1.2.6    - 6/18/2019 Various compiler cmd line options parsing tweaks.
+
+1.2.7    - 3/23/2020 Added the LLVM_BITCODE_GENERATION_FLAGS  to allow LTO support.
+
+1.2.8    - 3/23/2020 Added the LLVM_BITCODE_GENERATION_FLAGS  to allow LTO support. (pip uploading issues)
 """
 
-wllvm_version = '1.2.6'
-wllvm_date = 'June 18 2019'
+wllvm_version = '1.2.8'
+wllvm_date = 'March 23 2020'