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: undo attempt to use the TARGET_CROSS...

Browse Source
This commit is contained in:
Ciro Santilli
2018-03-12 12:00:00 +00:00
parent 77d2e0a8a5
commit 2c606e3e1a
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gem5/build
View File

@@ -20,15 +20,12 @@ shift "$(($OPTIND - 1))"
if [ -z "$j" ]; then if [ -z "$j" ]; then
j="$(nproc)" j="$(nproc)"
fi fi
top="$(dirname "$0")" top="$(cd $(dirname "$0") && pwd)"
system_dir="${top}/system" system_dir="${top}/system"
binaries_dir="${system_dir}/binaries" binaries_dir="${system_dir}/binaries"
disks_dir="${system_dir}/disks" disks_dir="${system_dir}/disks"
mkdir -p "$binaries_dir" "$disks_dir" mkdir -p "$binaries_dir" "$disks_dir"
cd "${top}/gem5" cd "${top}/gem5"
TARGET_CROSS=
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 CC=gcc-6 CXX=g++-6 scons -j"$j" --ignore-style build/X86/gem5.opt
f="${disks_dir}/linux-bigswap2.img" f="${disks_dir}/linux-bigswap2.img"

3
gem5/external.mk
View File

@@ -15,7 +15,8 @@ ARCH_MAKE = $(ARCH)
endif endif
define GEM5_BUILD_CMDS define GEM5_BUILD_CMDS
cd '$(@D)' && ./build -a '$(ARCH)' -c '$(TARGET_CROSS)' -j '$(BR2_JLEVEL)' # Cannot pass "-c '$(TARGET_CROSS)'" here because the ARM build uses aarch64 for the bootloader...
cd '$(@D)' && ./build -a '$(ARCH)' -j '$(BR2_JLEVEL)'
cd '$(@D)/gem5/util/m5' && $(MAKE) -f 'Makefile.$(ARCH_MAKE)' CC='$(TARGET_CC)' LD='$(TARGET_LD)' cd '$(@D)/gem5/util/m5' && $(MAKE) -f 'Makefile.$(ARCH_MAKE)' CC='$(TARGET_CC)' LD='$(TARGET_LD)'
endef endef