Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/52494 )
Change subject: arch: Decentralize the arch tag TagImplies in
arch/SConscript.
......................................................................
arch: Decentralize the arch tag TagImplies in arch/SConscript.
Put the TagImplies for each ISA in its own SConscript.
Change-Id: I90d72aa6f493ac2c27ec54e3ac02ff8151e2f518
---
M src/arch/sparc/SConscript
M src/arch/riscv/SConscript
M src/arch/SConscript
M src/arch/power/SConscript
M src/arch/x86/SConscript
M src/arch/mips/SConscript
M src/arch/arm/SConscript
7 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/arch/SConscript b/src/arch/SConscript
index cc003a3..2798a59 100644
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -56,25 +56,18 @@
#################################################################
if env['USE_ARM']:
- env.TagImplies('arm isa', 'gem5 lib')
isa = 'arm'
elif env['USE_MIPS']:
- env.TagImplies('mips isa', 'gem5 lib')
isa = 'mips'
elif env['USE_POWER']:
- env.TagImplies('power isa', 'gem5 lib')
isa = 'power'
elif env['USE_RISCV']:
- env.TagImplies('riscv isa', 'gem5 lib')
isa = 'riscv'
elif env['USE_SPARC']:
- env.TagImplies('sparc isa', 'gem5 lib')
isa = 'sparc'
elif env['USE_X86']:
- env.TagImplies('x86 isa', 'gem5 lib')
isa = 'x86'
elif env['USE_NULL']:
- env.TagImplies('null isa', 'gem5 lib')
isa = 'null'
env.SwitchingHeaders(
diff --git a/src/arch/arm/SConscript b/src/arch/arm/SConscript
index 6a09d96..70a36e5 100644
--- a/src/arch/arm/SConscript
+++ b/src/arch/arm/SConscript
@@ -40,6 +40,9 @@
Import('*')
+if env['USE_ARM']:
+ env.TagImplies('arm isa', 'gem5 lib')
+
GTest('aapcs64.test', 'aapcs64.test.cc', '../../base/debug.cc')
Source('decoder.cc', tags='arm isa')
Source('faults.cc', tags='arm isa')
diff --git a/src/arch/mips/SConscript b/src/arch/mips/SConscript
index f6a8ca5..adb017b 100644
--- a/src/arch/mips/SConscript
+++ b/src/arch/mips/SConscript
@@ -29,6 +29,9 @@
Import('*')
+if env['USE_MIPS']:
+ env.TagImplies('mips isa', 'gem5 lib')
+
Source('decoder.cc', tags='mips isa')
Source('dsp.cc', tags='mips isa')
Source('faults.cc', tags='mips isa')
diff --git a/src/arch/power/SConscript b/src/arch/power/SConscript
index 50d3317..3daa64d 100644
--- a/src/arch/power/SConscript
+++ b/src/arch/power/SConscript
@@ -30,6 +30,9 @@
Import('*')
+if env['USE_POWER']:
+ env.TagImplies('power isa', 'gem5 lib')
+
Source('decoder.cc', tags='power isa')
Source('faults.cc', tags='power isa')
Source('insts/branch.cc', tags='power isa')
diff --git a/src/arch/riscv/SConscript b/src/arch/riscv/SConscript
index 518528b..325871d 100644
--- a/src/arch/riscv/SConscript
+++ b/src/arch/riscv/SConscript
@@ -43,6 +43,9 @@
Import('*')
+if env['USE_RISCV']:
+ env.TagImplies('riscv isa', 'gem5 lib')
+
Source('decoder.cc', tags='riscv isa')
Source('faults.cc', tags='riscv isa')
Source('isa.cc', tags='riscv isa')
diff --git a/src/arch/sparc/SConscript b/src/arch/sparc/SConscript
index a90b035..49177ac 100644
--- a/src/arch/sparc/SConscript
+++ b/src/arch/sparc/SConscript
@@ -28,6 +28,9 @@
Import('*')
+if env['USE_SPARC']:
+ env.TagImplies('sparc isa', 'gem5 lib')
+
Source('asi.cc', tags='sparc isa')
Source('decoder.cc', tags='sparc isa')
Source('faults.cc', tags='sparc isa')
diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript
index 2a21d73..fa32eaf 100644
--- a/src/arch/x86/SConscript
+++ b/src/arch/x86/SConscript
@@ -40,6 +40,9 @@
Import('*')
+if env['USE_X86']:
+ env.TagImplies('x86 isa', 'gem5 lib')
+
Source('cpuid.cc', tags='x86 isa')
Source('decoder.cc', tags='x86 isa')
Source('decoder_tables.cc', tags='x86 isa')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/52494
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I90d72aa6f493ac2c27ec54e3ac02ff8151e2f518
Gerrit-Change-Number: 52494
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
