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

diff --git a/SConscript b/SConscript
index ddd16564bd7579cc7378e82bf55498469aea4ef2..310a7dd90ec7a6d69799b6caf23611559adab8f6 100644 (file)
--- 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 131016fc6825c4b41ba7e15a2713ee8ea08d5d97..9983d679bd6b86d0118249ff99811d2a90839303 100644 (file)
--- 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();
 }