changeset b47db5ac7d1c in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=b47db5ac7d1c
description:
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:
src/python/m5/__init__.py | 2 +-
src/python/m5/internal/__init__.py | 7 -------
2 files changed, 1 insertions(+), 8 deletions(-)
diffs (26 lines):
diff -r 5cfad3486991 -r b47db5ac7d1c src/python/m5/__init__.py
--- a/src/python/m5/__init__.py Wed Sep 18 11:28:28 2013 +0200
+++ b/src/python/m5/__init__.py Wed Sep 18 08:46:31 2013 -0400
@@ -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 -r 5cfad3486991 -r b47db5ac7d1c src/python/m5/internal/__init__.py
--- a/src/python/m5/internal/__init__.py Wed Sep 18 11:28:28 2013 +0200
+++ b/src/python/m5/internal/__init__.py Wed Sep 18 08:46:31 2013 -0400
@@ -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
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
