Dragonegg compiles apache on my vagrant box now, perhaps it will also compile on travis?

Author: ianamason

.travis.yml

@@ -8,14 +8,14 @@ python:
 install:
   - sudo apt-get update
   - sudo apt-get install llvm-3.4 clang-3.4 libapr1-dev libaprutil1-dev
-  - sudo apt-get install dragonegg llvm-3.3 llvm-gcc
+  - sudo apt-get install dragonegg llvm-3.0 llvm-gcc
   - export WLLVM_HOME=`pwd`
 
 # command to run tests
 script:
   # build apache with clang (i.e. httpd-2.4.12) 
   - ${WLLVM_HOME}/.travis/apache_clang.sh
-  # when it works we can uncomment this puppy out
+  # build apache with gcc and dragonegg (i.e. httpd-2.4.12) 
   # - ${WLLVM_HOME}/.travis/apache_dragonegg.sh
 
 

.travis/apache_dragonegg.sh

@@ -2,6 +2,7 @@
 # Make sure we exit if there is a failure
 set -e
 
+export dragonegg_disable_version_check=true
 
 export PATH=/usr/lib/llvm-3.0/bin:${WLLVM_HOME}:${PATH}
 export LLVM_COMPILER=dragonegg

driver/as

@@ -53,18 +53,15 @@ except AttributeError as e:
     logging.error('Output file argument not found.\nException message: ' + str(e))
     sys.exit(1)
 
-bcfilename = '.{0}.bc'.format(filename)
-bcPath = os.path.join(dirs, bcfilename)
-fakeAssembler = [llvmAssembler, infile, '-o', bcPath]
+fakeAssembler = [llvmAssembler, infile, '-o', argFilter.outFileName]
+
 asmProc = Popen(fakeAssembler)
 realRet = asmProc.wait()
 
 if realRet != 0:
     logging.error('llvm-as failed')
     sys.exit(realRet)
 
-attachBitcodePathToObject(bcPath, argFilter.outFileName)
-
 sys.exit(realRet)
 
 

driver/utils.py

@@ -184,6 +184,9 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
             '-current_version' : (1, ArgumentListFilter.linkBinaryCallback),
             '-compatibility_version' : (1, ArgumentListFilter.linkBinaryCallback),
 
+            # dragonegg mystery argument
+            '--64' : (0, ArgumentListFilter.compileUnaryCallback),
+
             #
             # BD: need to warn the darwin user that these flags will rain on their parade
             # (the Darwin ld is a bit single minded)
@@ -455,6 +458,8 @@ def attachBitcodePathToObject(bcPath, outFileName):
     # Don't try to attach a bitcode path to a binary.  Unfortunately
     # that won't work.
     (root, ext) = os.path.splitext(outFileName)
+    if DEBUG:
+        print('attachBitcodePathToObject: {0}  ===> {1} [ext = {2}]\n'.format(bcPath, outFileName, ext))
     #iam: this also looks very dodgey; we need a more reliable way to do this:
     if ext not in ('.o', '.lo', '.os', '.So', '.po'):
         _logger.warning('Cannot attach bitcode path to "{0} of type {1}"'.format(outFileName, FileType.getFileType(outFileName)))
@@ -520,6 +525,12 @@ def __init__(self, cmd, isCxx, prefixPath=None):
         else:
           self.prefixPath = ''
 
+    #clang and drogonegg share the same taste in bitcode filenames.
+    def getBitcodeFileName(self, argFilter):
+        (dirs, baseFile) = os.path.split(argFilter.getOutputFilename())
+        bcfilename = os.path.join(dirs, '.{0}.bc'.format(baseFile))
+        return bcfilename
+
 class ClangBuilder(BuilderBase):
     def __init__(self, cmd, isCxx, prefixPath=None):
         super(ClangBuilder, self).__init__(cmd, isCxx, prefixPath)
@@ -537,11 +548,6 @@ def getCompiler(self):
     def getBitcodeArglistFilter(self):
         return ClangBitcodeArgumentListFilter(self.cmd)
 
-    def getBitcodeFileName(self, argFilter):
-        (dirs, baseFile) = os.path.split(argFilter.getOutputFilename())
-        bcfilename = os.path.join(dirs, '.{0}.bc'.format(baseFile))
-        return bcfilename
-
     def extraBitcodeArgs(self, argFilter):
         bcPath = self.getBitcodeFileName(argFilter)
         return ['-o', bcPath]
@@ -562,8 +568,10 @@ def getBitcodeCompiler(self):
         # We use '-B' to tell gcc where to look for an assembler.
         # When we build LLVM bitcode we do not want to use the GNU assembler,
         # instead we want gcc to use our own assembler (see driver/as).
-        return cc + ['-B', driverDir, '-fplugin={0}'.format(pth),
-                     '-fplugin-arg-dragonegg-emit-ir']
+        cmd = cc + ['-B', driverDir, '-fplugin={0}'.format(pth), '-fplugin-arg-dragonegg-emit-ir']
+        if DEBUG:
+            print(cmd)
+        return cmd
 
     def getCompiler(self):
         pfx = ''
@@ -575,6 +583,7 @@ def getCompiler(self):
         else:
             return ['{0}{1}gcc'.format(self.prefixPath, pfx)]
 
+
     def getBitcodeArglistFilter(self):
         return ArgumentListFilter(self.cmd)
 
@@ -687,6 +696,8 @@ def buildBitcodeFile(builder, srcFile, bcFile):
     bcc.extend(af.compileArgs)
     bcc.extend(['-c', srcFile])
     bcc.extend(['-o', bcFile])
+    if DEBUG:
+        print('buildBitcodeFile: {0}\n'.format(bcc))
     proc = Popen(bcc)
     rc = proc.wait()
     if rc != 0:
@@ -699,6 +710,8 @@ def buildObjectFile(builder, srcFile, objFile):
     cc.extend(af.compileArgs)
     cc.append(srcFile)
     cc.extend(['-c', '-o',  objFile])
+    if DEBUG:
+        print('buildObjectFile: {0}\n'.format(cc))
     proc = Popen(cc)
     rc = proc.wait()
     if rc != 0:

test/test_files/Makefile

@@ -0,0 +1,45 @@
+#iam: please leave this Makefile; it is useful for debugging when things break.
+
+zero:
+	${CXX} hello.cc -o hello
+
+one:
+	${CC} foo.c bar.c baz.c main.c -o main
+
+two:
+	${CC} foo.c bar.c baz.c main.c -c
+	${CC} foo.o bar.o baz.o main.o -o main
+
+mix:
+	${CC} foo.c bar.c -c
+	${CC} foo.o bar.o baz.c main.c -o main
+
+objects:
+	${CC} foo.c -c
+	${CC} bar.c -c
+	${CC} baz.c -c
+	${CC} main.c -c
+
+many: objects
+	${CC} foo.o bar.o baz.o main.o -o main
+
+archive: objects
+	ar cr libfoo.a foo.o bar.o baz.o
+	ranlib libfoo.a
+
+dylib: objects
+	${CC} -dynamiclib foo.o bar.o baz.o -o libfoo.dylib
+
+deadstrip: objects
+	${CC} -dynamiclib -Wl,-dead_strip foo.o bar.o baz.o -o libfoo.dylib
+
+link_with_archive:: archive
+	$(CC) main.o libfoo.a -o main.arch
+
+clean:
+	rm -f *.o main main.arch .*.o.bc .*.o *.bc .*.bc a.out *.s *.i hello *.a *.bca *.dylib
+
+mystery:
+	otool -X -s __LLVM __llvm_bc main > main.otool
+	xxd -r main.otool
+	xxd -r main.otool main.xxd