Ignore:
Timestamp:
Jul 31, 2019, 3:34:45 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
df8b87cd, f9bf142
Parents:
c6f1f3e (diff), 61cfae2 (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.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tests/pybin/settings.py

    rc6f1f3e r0d92e5c  
    2222                'x86-64'                : 'x64',
    2323                'x86_64'                : 'x64',
     24                'aarch64'               : 'x64',
    2425                'x86'                   : 'x86',
    2526                'i386'          : 'x86',
     
    4041                        canonical_host = Architecture.make_canonical( config.HOSTARCH )
    4142                except KeyError:
    42                         print("Unkown host architecture %s" % config.HOSTARCH, file=sys.stderr)
     43                        print("Unknown host architecture %s" % config.HOSTARCH, file=sys.stderr)
    4344                        sys.exit(1)
    4445
     
    4748                                arch = Architecture.make_canonical( arch )
    4849                        except KeyError:
    49                                 print("Unkown architecture %s" % arch, file=sys.stderr)
     50                                print("Unknown architecture %s" % arch, file=sys.stderr)
    5051                                sys.exit(1)
    5152
Note: See TracChangeset for help on using the changeset viewer.