imgtools/romtools/rofsbuild/symbolgenerator.cpp
changeset 662 60be34e1b006
parent 654 7c11c3d8d025
parent 655 3f65fd25dfd4
child 663 8e27d440923e
equal deleted inserted replaced
654:7c11c3d8d025 662:60be34e1b006
    68 	iFinished = true; 
    68 	iFinished = true; 
    69 	iCond.notify_all();
    69 	iCond.notify_all();
    70     }
    70     }
    71 TPlacedEntry SymbolGenerator::GetNextPlacedEntry()
    71 TPlacedEntry SymbolGenerator::GetNextPlacedEntry()
    72 {
    72 {
       
    73         if(regex_search(fileName, what, regARMV5)) {
    73 	TPlacedEntry pe("", false);
    74 	TPlacedEntry pe("", false);
    74 	if(1)
    75 	if(1)
       
    76         else if(regex_search(fileName, what, regGCCEoARMV4)) {
    75 	{
    77 	{
    76 		boost::mutex::scoped_lock lock(iMutex);
    78 		boost::mutex::scoped_lock lock(iMutex);
    77 		while(!iFinished && iQueueFiles.empty())
    79 		while(!iFinished && iQueueFiles.empty())
    78 			iCond.wait(lock);
    80 			iCond.wait(lock);
    79 		if(!iQueueFiles.empty())
    81 		if(!iQueueFiles.empty())
   117 	{
   119 	{
   118 		if(symbolgenerator->HasFinished() && symbolgenerator->IsEmpty())
   120 		if(symbolgenerator->HasFinished() && symbolgenerator->IsEmpty())
   119 		{
   121 		{
   120 
   122 
   121                 break;
   123                 break;
       
   124                 if(!regex_search(sLibFile, what1, reg)) {
       
   125                     if(regex_search(sLibFile, what, reg3)) {
   122                     }
   126                     }
   123 
   127 
   124 
   128 
   125 
   129 
   126 
   130