Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47159 )
Change subject: misc: Merge branch 'minor-release-staging-v21-0-1'
......................................................................
misc: Merge branch 'minor-release-staging-v21-0-1'
Change-Id: I4ac09b563094f5b375246ee87eca364e5b6e131b
---
M SConstruct
M configs/common/Options.py
M src/Doxyfile
M src/base/version.cc
M src/python/m5/SimObject.py
6 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/SConstruct b/SConstruct
index 500dd29..041701f 100755
--- a/SConstruct
+++ b/SConstruct
@@ -385,20 +385,10 @@
for var in 'LTO_CCFLAGS', 'LTO_LDFLAGS':
main[var] = ['-flto']
-<<<<<<< HEAD (c05e08 python,scons: Only generate pybind if using python)
# clang has a few additional warnings that we disable.
with gem5_scons.Configure(main) as conf:
conf.CheckCxxFlag('-Wno-c99-designator')
conf.CheckCxxFlag('-Wno-defaulted-function-deleted')
-=======
- # clang has a few additional warnings that we disable, extraneous
- # parantheses are allowed due to Ruby's printing of the AST,
- # finally self assignments are allowed as the generated CPU code
- # is relying on this
- main.Append(CCFLAGS=['-Wno-parentheses', '-Wno-self-assign'])
- conf.CheckCxxFlag('-Wno-c99-designator')
- conf.CheckCxxFlag('-Wno-defaulted-function-deleted')
->>>>>>> BRANCH (a85e48 misc: Update the RELEASE-NOTES.md for v21.0.1.0)
main.Append(TCMALLOC_CCFLAGS=['-fno-builtin'])
diff --git a/configs/common/Options.py b/configs/common/Options.py
index 5936a17..75c60a8 100644
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -331,17 +331,10 @@
parser.add_argument(
"--take-simpoint-checkpoints", action="store", type=str,
help="<simpoint file,weight file,interval-length,warmup-length>")
-<<<<<<< HEAD (c05e08 python,scons: Only generate pybind if using python)
parser.add_argument("--restore-simpoint-checkpoint",
action="store_true",
default=False,
help="restore from a simpoint checkpoint taken
with " +
"--take-simpoint-checkpoints")
-=======
- parser.add_option("--restore-simpoint-checkpoint", action="store_true",
- default=False,
- help="restore from a simpoint checkpoint taken with " +
- "--take-simpoint-checkpoints")
->>>>>>> BRANCH (a85e48 misc: Update the RELEASE-NOTES.md for v21.0.1.0)
# Checkpointing options
# Note that performing checkpointing via python script files will
override
diff --git a/src/Doxyfile b/src/Doxyfile
index c17c430..f8b481e 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 (c05e08 python,scons: Only generate pybind if using python)
-PROJECT_NUMBER = DEVELOP-FOR-V21.1
-=======
PROJECT_NUMBER = v21.0.1.0
->>>>>>> BRANCH (a85e48 misc: Update the RELEASE-NOTES.md for v21.0.1.0)
# 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/base/version.cc b/src/base/version.cc
index 1a8df3e..4c0bebc 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -29,8 +29,5 @@
/**
* @ingroup api_base_utils
*/
-<<<<<<< HEAD (c05e08 python,scons: Only generate pybind if using python)
-const char *gem5Version = "[DEVELOP-FOR-V21.1]";
-=======
const char *gem5Version = "21.0.1.0";
->>>>>>> BRANCH (a85e48 misc: Update the RELEASE-NOTES.md for v21.0.1.0)
+
diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index 51f5adb..2223cee 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -874,11 +874,7 @@
# method, or the Dummy one. Either an implementation is
# mandantory since this was shunted off to the dummy
class, or
# one is optional which will override this weak version.
-<<<<<<< HEAD (c05e08 python,scons: Only generate pybind if using python)
code('GEM5_VAR_USED ${{cls.cxx_class}} *')
-=======
- code('M5_VAR_USED ${{cls.cxx_class}} *')
->>>>>>> BRANCH (a85e48 misc: Update the RELEASE-NOTES.md for v21.0.1.0)
code('Dummy${cls}Shunt<${{cls.cxx_class}}>::Params::create() '
'const')
code('{')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47159
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: I4ac09b563094f5b375246ee87eca364e5b6e131b
Gerrit-Change-Number: 47159
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
