Changeset ef46abb for configure


Ignore:
Timestamp:
Aug 12, 2019, 12:34:27 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
1ee048f
Parents:
14347ac (diff), 4f5a8a2 (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' into distcc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r14347ac ref46abb  
    34783478                "x86-64"     ) cannon_arch_name="x64";;
    34793479                "x86_64"     ) cannon_arch_name="x64";;
    3480                 "aarch64"    ) cannon_arch_name="x64";;
     3480                "aarch64"    ) cannon_arch_name="arm";;
    34813481                "x86"        ) cannon_arch_name="x86";;
    34823482                "i386"       ) cannon_arch_name="x86";;
     
    35203520                "x86-64"     ) cannon_arch_name="x64";;
    35213521                "x86_64"     ) cannon_arch_name="x64";;
    3522                 "aarch64"    ) cannon_arch_name="x64";;
     3522                "aarch64"    ) cannon_arch_name="arm";;
    35233523                "x86"        ) cannon_arch_name="x86";;
    35243524                "i386"       ) cannon_arch_name="x86";;
Note: See TracChangeset for help on using the changeset viewer.