summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2013-09-18 08:46:31 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2013-09-18 08:46:31 -0400
commitfe5212f9328c10939bbd062c7c57b4c299376803 (patch)
treeef11d35bdbd72cf10db6de9bd1d3a1a6870e68a9 /src
parente93e12a62b1ddadb91214f0a0134e75735194716 (diff)
downloadgem5-fe5212f9328c10939bbd062c7c57b4c299376803.tar.xz
swig: Fix issue with circular import in 2.0.9/2.0.10
This patch fixes an issue which prevented gem5 from running when built using swig 2.0.9 and 2.0.10. The generated event.py tried to import m5.internal which in turn relied on importing event. This patch seems to fix the problem, and so far has not caused any other issues.
Diffstat (limited to 'src')
-rw-r--r--src/python/m5/__init__.py2
-rw-r--r--src/python/m5/internal/__init__.py7
2 files changed, 1 insertions, 8 deletions
diff --git a/src/python/m5/__init__.py b/src/python/m5/__init__.py
index dc6c5a923..9df3f4bfe 100644
--- a/src/python/m5/__init__.py
+++ b/src/python/m5/__init__.py
@@ -32,7 +32,7 @@
try:
# Try to import something that's generated by swig
- import internal
+ import internal.core
# Try to grab something from it in case demandimport is being used
internal.core.curTick
diff --git a/src/python/m5/internal/__init__.py b/src/python/m5/internal/__init__.py
index 30090549a..b795f201f 100644
--- a/src/python/m5/internal/__init__.py
+++ b/src/python/m5/internal/__init__.py
@@ -25,10 +25,3 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# Authors: Nathan Binkert
-
-import core
-import debug
-import event
-import stats
-import trace
-from drain import DrainManager, Drainable