sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pc event now clears lower 2 bits

Browse source 
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
This commit is contained in:
Ali Saidi 2004-09-16 15:11:38 -04:00
parent a71541a3e8
commit 9adb64ec70
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SConscript
View file

@ -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'])
###################################################
#

4
cpu/pc_event.hh
View file

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