diff options
| -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(); } |