Merge lp:~rengolin/cbuild/llvm into lp:cbuild

Proposed by Renato Golin
Status: Merged
Approved by: Matthew Gretton-Dann
Approved revision: no longer in the source branch.
Merged at revision: 456
Proposed branch: lp:~rengolin/cbuild/llvm
Merge into: lp:cbuild
Diff against target: 36 lines (+15/-1)
2 files modified
lib/ (+8/-1)
tools/ (+7/-0)
To merge this branch: bzr merge lp:~rengolin/cbuild/llvm
Reviewer Review Type Date Requested Status
Matthew Gretton-Dann Approve
Review via email:

Description of the change

This is a silly merge, using the default options for ARM builds on buildbots and test-suites.

There might have a way of getting the current CPU in CBuild, but if not, I'd rather force A9 than let the default A8, since Clang/LLVM still can't figure out the actual CPU and use it instead of the default.

To post a comment you must log in.
Revision history for this message
Matthew Gretton-Dann (matthew-gretton-dann) wrote :

So this looks fine as is (its better than what is currently there).

A better way may be to use the GCCCONFARGS variable. This is set by the various build config Makefiles in cbuild/config (one for each queue type). This means that you can change the target build depending on which queue you use.

However, the GCCCONFARGS may not contain stuff that LLVM understands, so some rework of that or mangling of it may be necessary.

So this patch is an improvement on the current state (and so I'll approve it) - but there may be an even better way ahead.

review: Approve
Revision history for this message
Renato Golin (rengolin) wrote :

My thoughts exactly. I'll open a sub-task on the CBuild blueprint to deal with that.

lp:~rengolin/cbuild/llvm updated
456. By Christophe Lyon

Add symlinks to, and under
$(SYSROOT)/lib so that libsanitizer tests find these libs when

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/'
2--- lib/ 2011-03-16 00:12:31 +0000
3+++ lib/ 2013-06-06 14:40:41 +0000
4@@ -11,7 +11,14 @@
7 --prefix=$(TOP)/$(VBUILD)/install \
8- --enable-targets=host
9+ --enable-targets=host \
10+ --build=armv7l-unknown-linux-gnueabihf \
11+ --with-float=hard \
12+ --with-abi=aapcs-vfp \
13+ --with-cpu=cortex-a9 \
14+ --with-fpu=neon \
15+ --enable-optimized \
16+ --enable-assertions
18 include $(LIBDIR)/
21=== modified file 'tools/'
22--- tools/ 2011-04-17 23:26:05 +0000
23+++ tools/ 2013-06-06 14:40:41 +0000
24@@ -16,6 +16,13 @@
25 head=$2
27 svn up -q $branch
29+# needed for LLVM's multiple updates
30+if [[ $head = '' ]]; then
31+ echo "No tarball requested, update only, leaving."
32+ exit 0
35 latest=`svn info $branch | awk '/Revision:/ { print $2 }'`
36 revno=${REVNO:-$latest}


People subscribed via source and target branches