diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2004-09-16 15:11:38 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2004-09-16 15:11:38 -0400 |
| commit | 9adb64ec70047d7f8709399f67c74402753f6579 (patch) | |
| tree | ef0777e1aa914067d875f40d7516184538f73929 | |
| parent | a71541a3e81067ebb1b974a2d74c951dc7fcb628 (diff) | |
| download | gem5-9adb64ec70047d7f8709399f67c74402753f6579.tar.xz | |
pc event now clears lower 2 bits
always build with dynamic libraries for mysqlclient
SConscript:
always use dynamic library now
cpu/pc_event.hh:
cleared lower 2 bits, since everything must be 4byte aligned
--HG--
extra : convert_revision : 332ecd25a598e6a46a79bd653449aa7eb22a580a
| -rw-r--r-- | SConscript | 9 | ||||
| -rw-r--r-- | cpu/pc_event.hh | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/SConscript b/SConscript index ddd16564b..310a7dd90 100644 --- a/SConscript +++ b/SConscript @@ -384,11 +384,12 @@ if env['USE_MYSQL']: env.Append(CPPDEFINES = 'USE_MYSQL') env.Append(CPPPATH=['/usr/local/include/mysql', '/usr/include/mysql']) env.Append(LIBS=['z']) - if sys.platform.lower().startswith('linux'): - extra_libraries.append('/usr/lib/mysql/libmysqlclient.a') + if os.path.isdir('/usr/lib64'): + env.Append(LIBPATH=['/usr/lib64/mysql']) else: - env.Append(LIBS=['mysql']) - env.Append(LIBPATH=['/usr/local/lib/mysql/']) + env.Append(LIBPATH=['/usr/lib/mysql/']) + env.Append(LIBS=['mysqlclient']) + ################################################### # diff --git a/cpu/pc_event.hh b/cpu/pc_event.hh index 131016fc6..9983d679b 100644 --- a/cpu/pc_event.hh +++ b/cpu/pc_event.hh @@ -143,7 +143,7 @@ PCEvent::schedule(Addr pc) { if (evpc != badpc) panic("cannot switch PC"); - evpc = pc; + evpc = pc & ~0x3; return schedule(); } @@ -158,7 +158,7 @@ PCEvent::schedule(PCEventQueue *q, Addr pc) panic("cannot switch addresses"); queue = q; - evpc = pc; + evpc = pc & ~0x3; return schedule(); } |