Changeset 25a1cb0 for tools


Ignore:
Timestamp:
Sep 1, 2020, 1:18:10 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
86c1f1c3, a77496cb
Parents:
8d8ac3b (diff), d3aa64f1 (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

Location:
tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • tools/Makefile.am

    r8d8ac3b r25a1cb0  
    1818ACLOCAL_AMFLAGS  = -I automake
    1919
    20 AM_CFLAGS = -Wall -Wextra -O2 -g
     20EXTRA_DIST = build/distcc_hash build/push2dist.sh
    2121
    2222noinst_PROGRAMS = busy catchsig repeat watchdog
     23AM_CFLAGS = -Wall -Wextra -O2 -g
     24busy_LDFLAGS     = -pthread
    2325
    24 busy_SOURCES     = busy.c
    25 busy_LDFLAGS     = -pthread
    26 catchsig_SOURCES = catchsig.c
    27 repeat_SOURCES   = repeat.c
    28 watchdog_SOURCES = watchdog.c
     26nodist_busy_SOURCES     = busy.c
     27nodist_catchsig_SOURCES = catchsig.c
     28nodist_repeat_SOURCES   = repeat.c
     29nodist_watchdog_SOURCES = watchdog.c

  • tools/build/cfa.m4

    r8d8ac3b r25a1cb0  
    6666                "x86-64"     ) cannon_arch_name="x64";;
    6767                "x86_64"     ) cannon_arch_name="x64";;
    68                 "aarch64"    ) cannon_arch_name="arm";;
     68                "aarch64"    ) cannon_arch_name="arm64";;
     69                "arm4"       ) cannon_arch_name="arm64";;
     70                "ARM64"      ) cannon_arch_name="arm64";;
    6971                "x86"        ) cannon_arch_name="x86";;
    7072                "i386"       ) cannon_arch_name="x86";;
    … …  
    7274                "i686"       ) cannon_arch_name="x86";;
    7375                "Intel 80386") cannon_arch_name="x86";;
    74                 "arm"        ) cannon_arch_name="arm";;
    75                 "ARM"        ) cannon_arch_name="arm";;
    76                 "armv7l"     ) cannon_arch_name="arm";;
     76                "arm"        ) cannon_arch_name="arm32";;
     77                "ARM"        ) cannon_arch_name="arm32";;
     78                "arm32"      ) cannon_arch_name="arm32";;
     79                "ARM32"      ) cannon_arch_name="arm32";;
     80                "armv7l"     ) cannon_arch_name="arm32";;
    7781                *)
    7882                >&2 echo "Unknown architecture " $arch_name;

  • tools/prettyprinter/Makefile.am

    r8d8ac3b r25a1cb0  
    3030tools_prettyprinter_PROGRAMS = pretty
    3131tools_prettyprinterdir = ../
    32 pretty_SOURCES = ${SRC}
     32nodist_pretty_SOURCES = ${SRC}
    3333pretty_LDADD = ${LEXLIB} -ldl                   # yywrap
    3434pretty_CXXFLAGS = -Wno-deprecated -Wall -DYY_NO_INPUT -O2 -g -std=c++14
Note: See TracChangeset for help on using the changeset viewer.