3rd-party/linux-kernel-module-cheat
1
0
Fork 0
mirror of https://github.com/cirosantilli/linux-kernel-module-cheat.git synced 2026-01-23 02:05:57 +01:00
Code Issues Releases Wiki Activity

gem5: x86_64 gcc 7 compilation was fixed after latest pull

Browse Source 
So get rid of the specific gcc-6 and gcc-6 install.
This commit is contained in:
Ciro Santilli
2018-03-31 07:38:37 +01:00
parent 5f2a6fbd8b
commit af476687e1
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -57,8 +57,6 @@ coreutils \
" "
if "$gem5"; then if "$gem5"; then
pkgs="$pkgs \ pkgs="$pkgs \
g++-6 \
gcc-6 \
gcc-aarch64-linux-gnu \ gcc-aarch64-linux-gnu \
gcc-arm-linux-gnueabi \ gcc-arm-linux-gnueabi \
libgoogle-perftools-dev \ libgoogle-perftools-dev \

4
gem5/build
View File

@@ -27,7 +27,7 @@ disks_dir="${system_dir}/disks"
mkdir -p "$binaries_dir" "$disks_dir" mkdir -p "$binaries_dir" "$disks_dir"
cd "${top}/gem5" cd "${top}/gem5"
if [ "$arch" = x86_64 ]; then if [ "$arch" = x86_64 ]; then
CC=gcc-6 CXX=g++-6 scons -j "$j" --ignore-style build/X86/gem5.opt scons -j "$j" --ignore-style build/X86/gem5.opt
f="${disks_dir}/linux-bigswap2.img" f="${disks_dir}/linux-bigswap2.img"
dd if=/dev/zero of="$f" bs=1024 count=65536 dd if=/dev/zero of="$f" bs=1024 count=65536
mkswap "$f" mkswap "$f"
@@ -35,8 +35,6 @@ if [ "$arch" = x86_64 ]; then
# I'm not even joking. No one has ever built x86 gem5 without the magic dist dir present. # I'm not even joking. No one has ever built x86 gem5 without the magic dist dir present.
touch "${binaries_dir}/x86_64-vmlinux-2.6.22.9" touch "${binaries_dir}/x86_64-vmlinux-2.6.22.9"
elif [ "$arch" = arm ] || [ "$arch" = aarch64 ]; then elif [ "$arch" = arm ] || [ "$arch" = aarch64 ]; then
# Compilation fails with gcc 7 on that commit.
# There were some recent portability patches, so it will likely get there soon.
scons -j "$j" --ignore-style build/ARM/gem5.opt scons -j "$j" --ignore-style build/ARM/gem5.opt
make -C ./system/arm/dt/ make -C ./system/arm/dt/
# TODO use the buildroot cross compiler here, and remove the dependencies from configure. # TODO use the buildroot cross compiler here, and remove the dependencies from configure.