mirror of
				https://github.com/Z3Prover/z3
				synced 2025-11-04 13:29:11 +00:00 
			
		
		
		
	merged
This commit is contained in:
		
						commit
						ed97a3a180
					
				
					 2 changed files with 9 additions and 9 deletions
				
			
		| 
						 | 
					@ -1298,6 +1298,10 @@ def mk_config():
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
            CXXFLAGS = '%s -D_NO_OMP_' % CXXFLAGS
 | 
					            CXXFLAGS = '%s -D_NO_OMP_' % CXXFLAGS
 | 
				
			||||||
            SLIBEXTRAFLAGS = ''
 | 
					            SLIBEXTRAFLAGS = ''
 | 
				
			||||||
 | 
					        if DEBUG_MODE:
 | 
				
			||||||
 | 
					            CXXFLAGS     = '%s -g -Wall' % CXXFLAGS
 | 
				
			||||||
 | 
					        else:
 | 
				
			||||||
 | 
					            CXXFLAGS     = '%s -O3 -D _EXTERNAL_RELEASE -fomit-frame-pointer' % CXXFLAGS
 | 
				
			||||||
        sysname = os.uname()[0]
 | 
					        sysname = os.uname()[0]
 | 
				
			||||||
        if sysname == 'Darwin':
 | 
					        if sysname == 'Darwin':
 | 
				
			||||||
            SO_EXT    = '.dylib'
 | 
					            SO_EXT    = '.dylib'
 | 
				
			||||||
| 
						 | 
					@ -1331,10 +1335,6 @@ def mk_config():
 | 
				
			||||||
            CPPFLAGS     = '%s -DZ3DEBUG' % CPPFLAGS
 | 
					            CPPFLAGS     = '%s -DZ3DEBUG' % CPPFLAGS
 | 
				
			||||||
        if TRACE or DEBUG_MODE:
 | 
					        if TRACE or DEBUG_MODE:
 | 
				
			||||||
            CPPFLAGS     = '%s -D_TRACE' % CPPFLAGS
 | 
					            CPPFLAGS     = '%s -D_TRACE' % CPPFLAGS
 | 
				
			||||||
        if DEBUG_MODE:
 | 
					 | 
				
			||||||
            CXXFLAGS     = '%s -g -Wall' % CXXFLAGS
 | 
					 | 
				
			||||||
        else:
 | 
					 | 
				
			||||||
            CXXFLAGS     = '%s -O3 -D _EXTERNAL_RELEASE -fomit-frame-pointer' % CXXFLAGS
 | 
					 | 
				
			||||||
        CXXFLAGS         = '%s -msse -msse2' % CXXFLAGS
 | 
					        CXXFLAGS         = '%s -msse -msse2' % CXXFLAGS
 | 
				
			||||||
        config.write('PREFIX=%s\n' % PREFIX)
 | 
					        config.write('PREFIX=%s\n' % PREFIX)
 | 
				
			||||||
        config.write('CC=%s\n' % CC)
 | 
					        config.write('CC=%s\n' % CC)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -560,9 +560,9 @@ public:
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        unsigned finished_id       = UINT_MAX;
 | 
					        unsigned finished_id       = UINT_MAX;
 | 
				
			||||||
        par_exception_kind ex_kind;
 | 
					        par_exception_kind ex_kind = DEFAULT_EX;
 | 
				
			||||||
        std::string        ex_msg;
 | 
					        std::string        ex_msg;
 | 
				
			||||||
        unsigned           error_code;
 | 
					        unsigned           error_code = 0;
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        #pragma omp parallel for
 | 
					        #pragma omp parallel for
 | 
				
			||||||
        for (int i = 0; i < static_cast<int>(sz); i++) {
 | 
					        for (int i = 0; i < static_cast<int>(sz); i++) {
 | 
				
			||||||
| 
						 | 
					@ -734,8 +734,8 @@ public:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            bool found_solution = false;
 | 
					            bool found_solution = false;
 | 
				
			||||||
            bool failed         = false;
 | 
					            bool failed         = false;
 | 
				
			||||||
            par_exception_kind ex_kind;
 | 
					            par_exception_kind ex_kind = DEFAULT_EX;
 | 
				
			||||||
            unsigned error_code;
 | 
					            unsigned error_code = 0;
 | 
				
			||||||
            std::string  ex_msg;
 | 
					            std::string  ex_msg;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            #pragma omp parallel for
 | 
					            #pragma omp parallel for
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue