diff options
| author | alon@honor <none@none> | 2010-10-08 19:31:51 -0700 |
|---|---|---|
| committer | alon@honor <none@none> | 2010-10-08 19:31:51 -0700 |
| commit | 8e37aa593df856af80c4186633084a2d01fc995a (patch) | |
| tree | 018a98f0632a44ee2b391a884c0c59c03b0a9ba0 | |
| parent | efc63830c562beaf389642956c19b60c8d0cccdf (diff) | |
beginnings of fixes for clang 2.8
| -rw-r--r-- | src/intertyper.js | 5 | ||||
| -rw-r--r-- | tests/settings.py | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/intertyper.js b/src/intertyper.js index 4eb09367..2514b6b9 100644 --- a/src/intertyper.js +++ b/src/intertyper.js @@ -3,7 +3,8 @@ function intertyper(data) { // Substrate - LLVM_STYLE = data.indexOf('<label>') == -1 ? 'old' : 'new'; // new = clang on 2.8, old = llvm-gcc anywhere or clang on 2.7 + LLVM_STYLE = (data.indexOf('<label>') == -1 && data.indexOf('entry:') != -1) ? 'old' : 'new'; // new = clang on 2.8, old = llvm-gcc anywhere or clang on 2.7 + dprint('LLVM_STYLE: ' + LLVM_STYLE); substrate = new Substrate('Intertyper'); @@ -301,7 +302,7 @@ function intertyper(data) { __result__: true, intertype: 'label', ident: '%entry', - lineNum: item.lineNum + 'b', + lineNum: item.lineNum + '.5', }); } return ret; diff --git a/tests/settings.py b/tests/settings.py index a9afc91c..3f8de1a0 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -6,10 +6,10 @@ CLANG=os.path.expanduser(os.path.join(LLVM_ROOT, 'clang++')) LLVM_GCC=os.path.expanduser('~/Dev/llvm-gcc-4.2-2.8.source/cbuild/install/bin/llvm-g++') COMPILERS = { -# 'clang': { -# 'path': CLANG, -# 'quantum_size': 4, # See settings.js -# }, + 'clang': { + 'path': CLANG, + 'quantum_size': 4, # See settings.js + }, 'llvm_gcc': { 'path': LLVM_GCC, 'quantum_size': 1, |