gdwarf-4 from @lzto over at travich's.

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

@@ -1,6 +1,6 @@
 ![WLLVM](img/dragon128x128.png?raw_true)Whole Program LLVM
 
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blueviolet.svg)](https://opensource.org/licenses/MIT)
 [![PyPI version](https://badge.fury.io/py/wllvm.svg)](https://badge.fury.io/py/wllvm)
 [![Build Status](https://travis-ci.org/SRI-CSL/whole-program-llvm.svg?branch=master)](https://travis-ci.org/SRI-CSL/whole-program-llvm)
 [![PyPI Statistics](https://img.shields.io/pypi/dm/wllvm.svg)](https://pypistats.org/packages/wllvm)
@@ -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
 ---------
 

doc/tutorial-ubuntu-16.04.md

@@ -74,7 +74,14 @@ Extract the bitcode.
 >ls -la httpd.bc
 -rw-r--r-- 1 vagrant vagrant 1119584 Aug  4 20:02 httpd.bc
 ```
+> Note that in httpd-2.4.41, the binary of `httpd` is under directory ".libs",
+    > in that case, please cd into ".libs" then execute the command.
 
+```
+cd .libs
+ls -la httpd
+extract-bc httpd
+```
 ## Step 6.
 
 Turn the bitcode into a second executable binary. (optional -- just for fun and sanity checking)

wllvm/arglistfilter.py

@@ -153,6 +153,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             '-ggdb3' : (0, ArgumentListFilter.compileUnaryCallback),
             '-gdwarf-2' : (0, ArgumentListFilter.compileUnaryCallback),
             '-gdwarf-3' : (0, ArgumentListFilter.compileUnaryCallback),
+            '-gdwarf-4' : (0, ArgumentListFilter.compileUnaryCallback),
             '-gline-tables-only' : (0, ArgumentListFilter.compileUnaryCallback),
             '-grecord-gcc-switches': (0, ArgumentListFilter.compileUnaryCallback),
 

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,11 +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    - 6/18/2019 The File type fix."
+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.7'
-wllvm_date = 'June 18 2019'
+wllvm_version = '1.2.8'
+wllvm_date = 'March 23 2020'