Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/40535 )
Change subject: misc: Merge branch v20.1.0.3 hotfix into develop
......................................................................
misc: Merge branch v20.1.0.3 hotfix into develop
Change-Id: I12cca586627718bf41fe24f0fcd3f10c4fe48b2d
---
M src/Doxyfile
M src/arch/arm/system.cc
M src/base/version.cc
4 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/src/Doxyfile b/src/Doxyfile
index 60ca662..ddc3933 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -31,11 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
-PROJECT_NUMBER = DEVELOP-FOR-V20.2
-=======
PROJECT_NUMBER = v20.1.0.3
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc
index 22121e1..783366d 100644
--- a/src/arch/arm/system.cc
+++ b/src/arch/arm/system.cc
@@ -63,7 +63,6 @@
_genericTimer(nullptr),
_gic(nullptr),
_pwrCtrl(nullptr),
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
_highestELIs64(p.highest_el_is_64),
_physAddrRange64(p.phys_addr_range_64),
_haveLargeAsid64(p.have_large_asid_64),
@@ -71,30 +70,13 @@
_haveSVE(p.have_sve),
_sveVL(p.sve_vl),
_haveLSE(p.have_lse),
+ _haveVHE(p.have_vhe),
_havePAN(p.have_pan),
_haveSecEL2(p.have_secel2),
semihosting(p.semihosting),
multiProc(p.multi_proc)
-=======
- _highestELIs64(p->highest_el_is_64),
- _physAddrRange64(p->phys_addr_range_64),
- _haveLargeAsid64(p->have_large_asid_64),
- _haveTME(p->have_tme),
- _haveSVE(p->have_sve),
- _sveVL(p->sve_vl),
- _haveLSE(p->have_lse),
- _haveVHE(p->have_vhe),
- _havePAN(p->have_pan),
- _haveSecEL2(p->have_secel2),
- semihosting(p->semihosting),
- multiProc(p->multi_proc)
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
{
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
if (p.auto_reset_addr) {
-=======
- if (p->auto_reset_addr) {
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
_resetAddr = workload->getEntry();
} else {
_resetAddr = p.reset_addr;
diff --git a/src/base/version.cc b/src/base/version.cc
index 59554d3..d30ddd1 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -29,8 +29,4 @@
/**
* @ingroup api_base_utils
*/
-<<<<<<< HEAD (758011 scons,python: Fix `--without-python` flag)
-const char *gem5Version = "[DEVELOP-FOR-V20.2]";
-=======
const char *gem5Version = "20.1.0.3";
->>>>>>> BRANCH (cd21b5 misc: Updated the RELEASE-NOTES and version number)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40535
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: I12cca586627718bf41fe24f0fcd3f10c4fe48b2d
Gerrit-Change-Number: 40535
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s