misc: Merge branch 'release-staging-v20.0.0.0' into develop

[gem5.git] / configs / common / Simulation.py

diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index eadc8defbb09fd2a2062f3c94d2fc4fb89c58740..e53c755c6c09e1e5528158eaa29966641cd1a8bc 100644 (file)
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -40,18 +40,22 @@
 from __future__ import print_function
 from __future__ import absolute_import
 
+import six
 import sys
 from os import getcwd
 from os.path import join as joinpath
 
 from common import CpuConfig
-from . import ObjectList
+from common import ObjectList
 
 import m5
 from m5.defines import buildEnv
 from m5.objects import *
 from m5.util import *
 
+if six.PY3:
+    long = int
+
 addToPath('../common')
 
 def getCPUClass(cpu_type):