Skip to content

ARM cross compiler GCC 6 for Node >= 12 #1776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 18, 2019
Merged

ARM cross compiler GCC 6 for Node >= 12 #1776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
357d8e9
ansible: arm cross compiler support for gcc 6 & 8
rvagg Apr 17, 2019
0215cbc
jenkins: use gcc-6 for arm cross >= 12
rvagg Apr 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 54 additions & 35 deletions ansible/roles/cross-compiler/files/cc-selector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,61 @@
# create CC, CXX, CC_host and CXX_host environment variables appropriate for the
# worker label in use. Of the form: cross-compiler-(armv[67])-gcc-(4.[89](\.4)?)
# e.g. cross-compiler-armv6-gcc-4.8, or cross-compiler-armv7-gcc-4.9.4
# worker label in use. Of the form: cross-compiler-armv[67]-gcc-(4\.[89](\.4)?|6|8)

# Possible labels:
# cross-compiler-armv6-gcc-4.8
# cross-compiler-armv7-gcc-4.8
# cross-compiler-armv6-gcc-4.9
# cross-compiler-armv7-gcc-4.9
# cross-compiler-armv6-gcc-4.9.4
# cross-compiler-armv7-gcc-4.9.4
# cross-compiler-armv6-gcc-6
# cross-compiler-armv7-gcc-6
# cross-compiler-armv6-gcc-8
# cross-compiler-armv7-gcc-8

rpi_tools_base="/opt/raspberrypi/tools/"
rpi_newer_tools_base="/opt/raspberrypi/rpi-newer-crosstools/"
base_4_8_armv6="${rpi_tools_base}arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-"
base_4_8_armv7="${rpi_tools_base}arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-"
base_4_9_armv6="${rpi_tools_base}arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-"
base_4_9_armv7="${rpi_tools_base}arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-"
base_4_9_4_armv6="${rpi_newer_tools_base}x64-gcc-4.9.4-binutils-2.28/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-"
base_4_9_4_armv7="${rpi_newer_tools_base}x64-gcc-4.9.4-binutils-2.28/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-"
base_4_8="${rpi_tools_base}arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-"
base_4_9="${rpi_tools_base}arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-"
base_4_9_4="${rpi_newer_tools_base}x64-gcc-4.9.4-binutils-2.28/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-"
base_6="${rpi_newer_tools_base}x64-gcc-6.5.0/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-"
base_8="${rpi_newer_tools_base}x64-gcc-8.3.0/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-"
flags_armv6="-march=armv6zk"
flags_armv7="-march=armv7-a"

export arm_type=$(echo $1 | sed -E 's/^cross-compiler-(armv[67])-gcc-(4.[89](\.4)?)/\1/')
export gcc_version=$(echo $1 | sed -E 's/^cross-compiler-(armv[67])-gcc-4\.([89](\.4)?)/4.\2/')
export git_branch="cc-${arm_type}"

if [[ ! "$arm_type" =~ ^armv[67]$ ]]; then
echo "Could not determine ARM type from '$1'"
exit 1
fi
if [[ ! "$gcc_version" =~ ^4\.[89](\.4)?$ ]]; then
echo "Could not determine ARM type from '$1'"
exit 1
fi

gcc_version_safe="$(echo $gcc_version | sed -E 's/\./_/g')"
gcc_host_version="$(echo $gcc_version | sed -E 's/\.4//g')" # 4.9.4 -> 4.9

echo "ARM type: $arm_type, GCC version: $gcc_version"

base_varname="base_${gcc_version_safe}_${arm_type}"
flags_varname="flags_${arm_type}"

export ARCH="${arm_type}l"
export DESTCPU=arm
export CC_host="ccache gcc-${gcc_host_version} -m32"
export CXX_host="ccache g++-${gcc_host_version} -m32"
export CC="ccache ${!base_varname}gcc ${!flags_varname}"
export CXX="ccache ${!base_varname}g++ ${!flags_varname}"
function run {
local label="$1"

export arm_type=$(echo $label | sed -E 's/^cross-compiler-(armv[67])-gcc-.*$/\1/')
export gcc_version=$(echo $label | sed -E 's/^cross-compiler-armv[67]-gcc-(4\.[89](\.4)?|6|8)/\1/')
export git_branch="cc-${arm_type}"

if [[ ! "$arm_type" =~ ^armv[67]$ ]]; then
echo "Could not determine ARM type from '$label'"
exit 1
fi
if [[ ! "$gcc_version" =~ ^(4\.[89](\.4)?|6|8)$ ]]; then
echo "Could not determine ARM type from '$label'"
exit 1
fi

gcc_version_safe="$(echo $gcc_version | sed -E 's/\./_/g')"
gcc_host_version="$(echo $gcc_version | sed -E 's/\.4//g')" # 4.9.4 -> 4.9

base_varname="base_${gcc_version_safe}"
flags_varname="flags_${arm_type}"

echo "ARM variant: $arm_type"
echo "GCC version: $gcc_version"
echo "Using compiler at: ${!base_varname}gcc"
echo "Using commpiler flags: ${!flags_varname}"

export ARCH="${arm_type}l"
export DESTCPU=arm
export CC_host="ccache gcc-${gcc_host_version} -m32"
export CXX_host="ccache g++-${gcc_host_version} -m32"
export CC="ccache ${!base_varname}gcc ${!flags_varname}"
export CXX="ccache ${!base_varname}g++ ${!flags_varname}"
}

run $1
4 changes: 2 additions & 2 deletions jenkins/scripts/VersionSelectorScript.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ def buildExclusions = [
[ /^debian9-docker-armv7$/, anyType, lt(10) ],
[ /^pi1-docker$/, releaseType, gte(10) ],
[ /^cross-compiler-armv[67]-gcc-4.8$/, anyType, gte(10) ],
[ /^cross-compiler-armv[67]-gcc-4.8$/, anyType, gte(10) ],
[ /^cross-compiler-armv[67]-gcc-4.9/, anyType, lt(10) ],
[ /^cross-compiler-armv[67]-gcc-4.9/, anyType, lt(10) ],
[ /^cross-compiler-armv[67]-gcc-4.9/, anyType, gte(12) ],
[ /^cross-compiler-armv[67]-gcc-6/, anyType, lt(12) ],

// Windows -----------------------------------------------
[ /vs2013/, anyType, gte(6) ],
Expand Down