marc
/
gcc-explorer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

First gasp at updating sample GCC explorer settings

Browse Source
dev/git-series/gccdum
Matt Godbolt 8 years ago
parent f4e76d2c56
commit 7f39772e9b
3 changed files with 76 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
app.js
Unescape Escape View File

@ -196,7 +196,7 @@ function findCompilers() {
return x !== null;
});
compilers = compilers.sort(function (x, y) {
return x.version < y.version ? -1 : x.version > y.version ? 1 : 0;
return x.name < y.name ? -1 : x.name > y.name ? 1 : 0;
});
return compilers;
});

66
etc/config/gcc-explorer.amazon.properties
Unescape Escape View File

@ -1,8 +1,70 @@
# Settings overridden for Amazon EC2 instances that power http://gcc.godbolt.org/
compileTimeoutMs=2000
compilers=/usr/bin/g++-4.4:/usr/bin/g++-4.5:/usr/bin/g++-4.6:/usr/bin/g++-4.7:/usr/bin/arm-linux-gnueabi-g++-4.5:/usr/bin/clang++:/usr/bin/avr-g++:/usr/bin/msp430-g++:/usr/bin/arm-linux-gnueabi-g++-4.6:/opt/intel/bin/icc:/usr/bin/g++-4.8:/opt/clang-3.2/bin/clang++:/opt/clang-3.3/bin/clang++:/opt/gcc-4.9.0-with-concepts/bin/g++:/opt/gcc-4.9.0-0909-concepts/bin/g++:/opt/gcc-4.9.0/bin/g++:/opt/clang+llvm-3.4.1-x86_64-unknown-ubuntu12.04/bin/clang++
defaultCompiler=/opt/gcc-4.9.0/bin/g++
compiler-wrapper=./c-preload/compiler-wrapper
max-asm-size=500000
cacheMb=300
clientGoogleAnalyticsEnabled=true
compilers=g447:g453:g464:g473:g481:g490:armg453:clang30:avrg453:msp430g453:armg463:icc1301:clang32:clang33:clang341:g490c1:g490c2
defaultCompiler=g490
###############################
# GCC for x86
compiler.g447.exe=/usr/bin/g++-4.4
compiler.g447.alias=/usr/bin/g++-4.4
compiler.g447.name=x86 gcc 4.4.7
compiler.g453.exe=/usr/bin/g++-4.5
compiler.g453.alias=/usr/bin/g++-4.5
compiler.g453.name=x86 gcc 4.5.3
compiler.g464.exe=/usr/bin/g++-4.6
compiler.g464.alias=/usr/bin/g++-4.6
compiler.g464.name=x86 gcc 4.6.4
compiler.g473.exe=/usr/bin/g++-4.7
compiler.g473.alias=/usr/bin/g++-4.7
compiler.g473.name=x86 gcc 4.7.3
compiler.g481.exe=/usr/bin/g++-4.8
compiler.g481.alias=/usr/bin/g++-4.8
compiler.g481.name=x86 gcc 4.8.1
compiler.g490.exe=/opt/gcc-4.9.0/bin/g++
compiler.g490.alias=/opt/gcc-4.9.0/bin/g++
compiler.g490.name=x86 gcc 4.9.0
# GCC (concepts branch) for x86
compiler.g490c1.exe=/opt/gcc-4.9.0-with-concepts/bin/g++
compiler.g490c1.alias=/opt/gcc-4.9.0-with-concepts/bin/g++
compiler.g490c1.name=x86 gcc 4.9.0 (w/concepts)
compiler.g490c2.exe=/opt/gcc-4.9.0-0909-concepts/bin/g++
compiler.g490c2.alias=/opt/gcc-4.9.0-0909-concepts/bin/g++
compiler.g490c2.name=x86 gcc 4.9.0 (w/concepts)
# Intel for x86
compiler.icc1301.exe=/opt/intel/bin/icc
compiler.icc1301.alias=/opt/intel/bin/icc
compiler.icc1301.name=x86 icc 13.0.1
# Clang for x86
compiler.clang30.exe=/usr/bin/clang++
compiler.clang30.alias=/usr/bin/clang++
compiler.clang30.name=x86 clang 3.0
compiler.clang32.exe=/opt/clang-3.2/bin/clang++
compiler.clang32.alias=/opt/clang-3.2/bin/clang++
compiler.clang32.name=x86 clang 3.2
compiler.clang33.exe=/opt/clang-3.3/bin/clang++
compiler.clang33.alias=/opt/clang-3.3/bin/clang++
compiler.clang33.name=x86 clang 3.3
compiler.clang341.exe=/opt/clang+llvm-3.4.1-x86_64-unknown-ubuntu12.04/bin/clang++
compiler.clang341.alias=/opt/clang+llvm-3.4.1-x86_64-unknown-ubuntu12.04/bin/clang++
compiler.clang341.name=x86 clang 3.4.1
###############################
# GCC for ARM
compiler.armg453.exe=/usr/bin/arm-linux-gnueabi-g++-4.5
compiler.armg453.alias=/usr/bin/arm-linux-gnueabi-g++-4.5
compiler.armg453.name=ARM gcc 4.5.3
compiler.armg463.exe=/usr/bin/arm-linux-gnueabi-g++-4.6
compiler.armg463.alias=/usr/bin/arm-linux-gnueabi-g++-4.6
compiler.armg463.name=ARM gcc 4.6.3
################################
# MSP and AVR
compiler.avrg453.exe=/usr/bin/avr-g++
compiler.avrg453.alias=/usr/bin/avr-g++
compiler.avrg453.name=AVR gcc 4.5.3
compiler.msp430g453.exe=/usr/bin/msp430-g++
compiler.msp430g453.alias=/usr/bin/msp430-g++
compiler.msp430g453.name=MSP430 gcc 4.5.3

16
static/compiler.js
Unescape Escape View File

@ -239,7 +239,7 @@ function Compiler(domRoot, origFilters, windowLocalPrefix, onChangeCallback, cmM
var state = {
sourcez: LZString.compressToBase64(cppEditor.getValue()),
compiler: domRoot.find('.compiler').val(),
options: domRoot.find('.compiler_options').val(),
options: domRoot.find('.compiler_options').val()
};
return state;
}
@ -250,6 +250,7 @@ function Compiler(domRoot, origFilters, windowLocalPrefix, onChangeCallback, cmM
} else {
cppEditor.setValue(state.source);
}
state.compiler = mapCompiler(state.compiler);
domRoot.find('.compiler').val(state.compiler);
domRoot.find('.compiler_options').val(state.options);
// Somewhat hackily persist compiler into local storage else when the ajax response comes in
@ -268,6 +269,14 @@ function Compiler(domRoot, origFilters, windowLocalPrefix, onChangeCallback, cmM
domRoot.find('.filter button.btn[value="intel"]').toggleClass("disabled", !compiler.supportedOpts["-masm"]);
}
function mapCompiler(compiler) {
if (!compilersById[compiler]) {
// Handle old settings and try the alias table.
compiler = compilersByAlias[compiler].id;
}
return compiler;
}
function setCompilers(compilers, defaultCompiler) {
domRoot.find('.compiler option').remove();
compilersById = {};
@ -279,10 +288,7 @@ function Compiler(domRoot, origFilters, windowLocalPrefix, onChangeCallback, cmM
});
var compiler = getSetting('compiler');
if (!compiler) compiler = defaultCompiler;
if (!compilersById[compiler]) {
// Handle old settings and try the alias table.
compiler = compilersByAlias[compiler].id;
}
compiler = mapCompiler(compiler);
if (compiler) {
domRoot.find('.compiler').val(compiler);
}

Write Preview
Loading…
Cancel
Save