Changeset ff29f08 for src/driver/cfa.cc
- Timestamp:
- May 18, 2018, 2:09:21 PM (6 years ago)
- Branches:
- new-env, with_gc
- Children:
- 2472a19
- Parents:
- f6f0cca3 (diff), c7d8100c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/driver/cfa.cc
rf6f0cca3 rff29f08 10 10 // Created On : Tue Aug 20 13:44:49 2002 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : Mon Feb 5 22:05:28201813 // Update Count : 16612 // Last Modified On : Mon May 14 14:16:33 2018 13 // Update Count : 244 14 14 // 15 15 … … 19 19 #include <unistd.h> // execvp 20 20 #include <string> // STL version 21 21 #include <string.h> // strcmp 22 23 #include "Common/SemanticError.h" 22 24 #include "config.h" // configure info 23 25 … … 156 158 args[nargs] = argv[i]; // pass the argument along 157 159 nargs += 1; 158 } else if ( prefix( arg, "-std=" ) ) {160 } else if ( prefix( arg, "-std=" ) || prefix( arg, "--std=" ) ) { 159 161 std_flag = true; // -std=XX provided 160 162 args[nargs] = argv[i]; // pass the argument along 161 163 nargs += 1; 164 } else if ( arg == "-x" ) { // lost so force along 165 args[nargs] = argv[i]; // pass the argument along 166 nargs += 1; 167 i += 1; // advance to argument 168 args[nargs] = argv[i]; // pass the argument along 169 nargs += 1; 170 args[nargs] = ( *new string( string("-D__GCC_X__=") + argv[i] ) ).c_str(); // add the argument for -x 171 nargs += 1; 172 } else if ( prefix( arg, "-x" ) ) { // lost so force along 173 args[nargs] = argv[i]; // pass the argument along 174 nargs += 1; 175 args[nargs] = ( *new string( string("-D__GCC_X__=") + arg.substr(2) ) ).c_str(); // add the argument for -x 176 nargs += 1; 177 } else if ( arg == "-w" ) { 178 args[nargs] = argv[i]; // pass the argument along 179 nargs += 1; 180 args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp 181 nargs += 1; 182 } else if ( prefix( arg, "-W" ) ) { // check before next tests 183 if ( arg == "-Werror" || arg == "-Wall" ) { 184 args[nargs] = argv[i]; // pass the argument along 185 nargs += 1; 186 args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp 187 nargs += 1; 188 } else { 189 unsigned int adv = prefix( arg, "-Wno-" ) ? 5 : 2; 190 args[nargs] = argv[i]; // conditionally pass the argument along 191 const char * warning = argv[i] + adv; // extract warning 192 if ( SemanticWarning_Exist( warning ) ) { // replace the argument for cfa-cpp 193 args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); 194 } // if 195 nargs += 1; 196 } // if 162 197 } else if ( prefix( arg, "-B" ) ) { 163 198 Bprefix = arg.substr(2); // strip the -B flag … … 218 253 } // for 219 254 255 #ifdef __x86_64__ 256 args[nargs] = "-mcx16"; // allow double-wide CAA 257 nargs += 1; 258 #endif // __x86_64__ 259 220 260 #ifdef __DEBUG_H__ 221 261 cerr << "args:"; … … 246 286 if ( link ) { 247 287 #if ! defined(HAVE_LIBCFA_RELEASE) 248 if ( !debug ) {249 cerr << "error: Option -nodebug is notavailable, libcfa was not installed." << endl;288 if ( ! debug ) { 289 cerr << "error: Option -nodebug is unavailable, libcfa was not installed." << endl; 250 290 exit( EXIT_FAILURE ); 251 }291 } // if 252 292 #endif 253 293 #if ! defined(HAVE_LIBCFA_DEBUG) 254 if ( debug ) {255 cerr << "error: Option -debug is notavailable, libcfa-d was not installed." << endl;294 if ( debug ) { 295 cerr << "error: Option -debug is unavailable, libcfa-d was not installed." << endl; 256 296 exit( EXIT_FAILURE ); 257 }297 } // if 258 298 #endif 259 299 … … 270 310 args[nargs] = "-L" CFA_LIBDIR; 271 311 nargs += 1; 272 if ( debug ) {312 if ( debug ) { 273 313 args[nargs] = "-lcfa-d"; 274 314 } else { 275 315 args[nargs] = "-lcfa"; 276 } 316 } // if 277 317 nargs += 1; 278 318 args[nargs] = "-lpthread"; … … 355 395 args[nargs] = "-Wno-deprecated"; 356 396 nargs += 1; 357 if ( ! std_flag ) { // default c 99, if none specified358 args[nargs] = "-std=gnu 99";397 if ( ! std_flag ) { // default c11, if none specified 398 args[nargs] = "-std=gnu11"; 359 399 nargs += 1; 360 400 } // if
Note: See TracChangeset
for help on using the changeset viewer.