Merge branch 'master' of https://github.com/travitch/whole-program-llvm

Author: travitch

NOTES.txt

@@ -1,58 +1,23 @@
-WARNING:Did not recognize the compiler flag "-m32"
-WARNING:Did not recognize the compiler flag "-march=i686"
-WARNING:Did not recognize the compiler flag "-B/home/iam/world/usr/src/lib32/usr/lib32"
-WARNING:Did not recognize the compiler flag "-mpreferred-stack-boundary=2"
-WARNING:Did not recognize the compiler flag "-mno-align-long-strings"
-WARNING:Did not recognize the compiler flag "-mrtd"
-WARNING:Did not recognize the compiler flag "-mregparm=3"
-WARNING:Did not recognize the compiler flag "-mstack-alignment=8"
-WARNING:Did not recognize the compiler flag "-mllvm"
-WARNING:Did not recognize the compiler flag "-inline-threshold=3"
-WARNING:Did not recognize the compiler flag "-enable-load-pre=false"
-WARNING:Did not recognize the compiler flag "-mllvm"
-WARNING:Did not recognize the compiler flag "-simplifycfg-dup-ret"
-WARNING:Did not recognize the compiler flag "-march=i386"
-WARNING:Did not recognize the compiler flag "cat.lo" ....
-WARNING:Did not recognize the compiler flag "-Ttext"
-WARNING:Did not recognize the compiler flag "0x600"
-WARNING:Did not recognize the compiler flag "-m"
-WARNING:Did not recognize the compiler flag "elf_i386_fbsd"
 
+"-m32"
+"-march=i686"
+"-B/home/iam/world/usr/src/lib32/usr/lib32"
+"-mpreferred-stack-boundary=2"
+"-mno-align-long-strings"
+"-mrtd"
+"-mregparm=3"
+"-mstack-alignment=8"
+"-mllvm"
+"-inline-threshold=3"
+"-enable-load-pre=false"
+"-mllvm"
+"-simplifycfg-dup-ret"
+"-march=i386"
+"cat.lo" ....
+"-Ttext"
+"0x600"
+"-m"
+"elf_i386_fbsd"
 
-Darwin linker flags:
-
-WARNING:Did not recognize the compiler flag "-dynamiclib"
-WARNING:Did not recognize the compiler flag "-current_version"
-WARNING:Did not recognize the compiler flag "2.2.2"
-WARNING:Did not recognize the compiler flag "-compatibility_version"
-WARNING:Did not recognize the compiler flag "2.2.0"
-
-Attempt to attach bitcode stuff on MacOS using ld:
-
- ld -r <file.o> -sectcreate __LLVM __llvm_bc <tmpfile> -o <file.o>
-
-This works (it adds a new section called __llvm_bc in a new __LLVM
-segment), but the 'ld -r' part may have bad side effects. For example
-if the <file.o> is produced with -fvisibility=hidden then calling
-ld -r <file.o> converts the extern symbols into local symbols.
-
-Workaround for now: give a warning if we see -fvisibility=hidden on
-the Mac.
-
-
-
-TODO: extract-bc for MacOS
-
-To extract bitcode from binaries, objects, or library files on Darwin:
-
-  otool -X -s __LLVM __llvm_bc yices_sat | xxd -r 
-
-Explanations:
-
-  otool -s __LLVM __llvm_bc file  extracts and display the section we care about
-
-  flag -X removes some useless headers we don't want
-
-  xxd -r converts the hexdump to ASCII list of file names
 
 

driver/utils.py

@@ -118,6 +118,7 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             '-m3dnow' : (0, ArgumentListFilter.compileUnaryCallback),
             '-mno-3dnow' : (0, ArgumentListFilter.compileUnaryCallback),
 
+            
             # Preprocessor assertion
             '-A' : (1, ArgumentListFilter.compileBinaryCallback),
             '-D' : (1, ArgumentListFilter.compileBinaryCallback),
@@ -192,7 +193,8 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             '-current_version' : (1, ArgumentListFilter.linkBinaryCallback),
             '-compatibility_version' : (1, ArgumentListFilter.linkBinaryCallback),
 
-            # bd: need to warn the darwin user that these flags will rain on their parade
+            #
+            # BD: need to warn the darwin user that these flags will rain on their parade
             # (the Darwin ld is a bit single minded)
             #
             # 1) compilation with -fvisibility=hidden causes trouble when we try to
@@ -202,7 +204,9 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             # 2) all stripping commands (e.g., -dead_strip) remove the __LLVM segment after
             #    linking
             #
-            '-fvisibility=hidden' :  (0, ArgumentListFilter.darwinWarningCompileUnaryCallback),
+            # Update: found a fix for problem 1: add flag -keep_private_externs when
+            # calling ld -r.
+            #
             '-Wl,-dead_strip' :  (0, ArgumentListFilter.darwinWarningLinkUnaryCallback),
 
            }
@@ -333,13 +337,6 @@ def linkUnaryCallback(self, flag):
     def compileUnaryCallback(self, flag):
         self.compileArgs.append(flag)
 
-    def darwinWarningCompileUnaryCallback(self, flag):
-        if sys.platform.startswith('darwin'):
-            _logger.warning('The flag "{0}" cannot be used with this tool'.format(flag))
-            sys.exit(1)
-        else:
-            self.compileArgs.append(flag)
-
     def darwinWarningLinkUnaryCallback(self, flag):
         if sys.platform.startswith('darwin'):
             _logger.warning('The flag "{0}" cannot be used with this tool'.format(flag))
@@ -490,7 +487,7 @@ def attachBitcodePathToObject(bcPath, outFileName):
 
     # Now write our bitcode section
     if (sys.platform.startswith('darwin')):
-        objcopyCmd = ['ld', '-r', outFileName, '-sectcreate', darwinSegmentName, darwinSectionName,  f.name, '-o', outFileName]
+        objcopyCmd = ['ld', '-r', '-keep_private_externs', outFileName, '-sectcreate', darwinSegmentName, darwinSectionName,  f.name, '-o', outFileName]
     else:
         objcopyCmd = ['objcopy', '--add-section', '{0}={1}'.format(elfSectionName, f.name), outFileName]
     orc = 0
@@ -683,8 +680,8 @@ def linkFiles(builder, objectFiles):
     af = builder.getBitcodeArglistFilter()
     outputFile = af.getOutputFilename()
     cc = builder.getCompiler()
-    cc.extend(af.objectFiles)
     cc.extend(objectFiles)
+    cc.extend(af.objectFiles)
     cc.extend(af.linkArgs)
     cc.extend(['-o', outputFile])
     proc = Popen(cc)

extract-bc

@@ -144,10 +144,9 @@ def handleExecutable(inputFile, outputFile, extractor, llvmLinker):
     if outputFile == None:
         outputFile = inputFile + '.' + moduleExtension
 
-    linkCmd = [ llvmLinker, '-o', outputFile ]
-    
-    if verboseFlag:
-        linkCmd.insert(1, '-v')
+    linkCmd = [ llvmLinker, '-v' ] if verboseFlag else [ llvmLinker ]
+
+    linkCmd.extend(['-o', outputFile ])
 
     linkCmd.extend([x for x in fileNames if x != ''])
     logging.info('Writing output to {0}'.format(outputFile))
@@ -164,8 +163,6 @@ def handleArchive(inputFile, outputFile, arCmd, fileType, extractor, llvmArchive
     originalDir = os.getcwd() # This will be the destination
 
     arCmd.append(inputFile);
-    if verboseFlag:
-        arCmd.insert(1, '-v')
 
     # Make temporary directory to extract objects to
     tempDir = ''
@@ -344,7 +341,7 @@ def process_file_unix(inputFile, outputFile, llvmLinker, llvmArchiver):
     logging.debug('Detected file type is {0}'.format(FileType.revMap[ft]))
 
     extractor = extract_section_linux
-    arCmd     = ['ar','x']
+    arCmd   =  ['ar', 'xv'] if verboseFlag else ['ar', 'x']
     ofileType = FileType.ELF_OBJECT
 
     if ft == FileType.ELF_EXECUTABLE or ft == FileType.ELF_SHARED:
@@ -364,7 +361,7 @@ def process_file_darwin(inputFile, outputFile, llvmLinker, llvmArchiver):
     logging.debug('Detected file type is {0}'.format(FileType.revMap[ft]))
 
     extractor = extract_section_darwin
-    arCmd     = ['ar','-x']
+    arCmd   =  ['ar', '-x', '-v'] if verboseFlag else ['ar', '-x']
     ofileType = FileType.MACH_OBJECT
 
     if ft == FileType.MACH_EXECUTABLE or ft == FileType.MACH_SHARED: