diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-04-24 08:59:48 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-04-24 08:59:48 +0200 |
| commit | 03fcfd1ba1627f5af84a84a8e0876d19ed88eefa (patch) | |
| tree | ea41e3b2a00525faa7a65d2c19146ded4a05c050 | |
| parent | m readme (diff) | |
| download | hungarian-algorithm-n3-03fcfd1ba1627f5af84a84a8e0876d19ed88eefa.tar.gz hungarian-algorithm-n3-03fcfd1ba1627f5af84a84a8e0876d19ed88eefa.tar.bz2 hungarian-algorithm-n3-03fcfd1ba1627f5af84a84a8e0876d19ed88eefa.tar.xz | |
m + enable more warnings
Signed-off-by: Mattias Andrée <maandree@operamail.com>
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | Makefile | 25 | ||||
| -rw-r--r-- | hungarian.c | 6 |
3 files changed, 30 insertions, 11 deletions
@@ -1,7 +1,13 @@ /hungarian - *~ \#*\# -.\#* +.* +!.git* *.bak *.swp +*.swo +*.su +*.o +*.out +*.gch + @@ -1,8 +1,21 @@ -all: - gcc -g -o "hungarian"{,.c} +OPTIMISE = -Og -g +WARN = -Wall -Wextra -pedantic -Wdouble-promotion -Wformat=2 -Winit-self -Wmissing-include-dirs \ + -Wtrampolines -Wfloat-equal -Wshadow -Wmissing-prototypes -Wmissing-declarations \ + -Wredundant-decls -Wnested-externs -Winline -Wno-variadic-macros -Wsync-nand \ + -Wunsafe-loop-optimizations -Wcast-align -Wstrict-overflow \ + -Wundef -Wbad-function-cast -Wcast-qual -Wwrite-strings -Wlogical-op -Waggregate-return \ + -Wstrict-prototypes -Wold-style-definition -Wpacked -Wvector-operation-performance \ + -Wunsuffixed-float-constants -Wsuggest-attribute=const -Wsuggest-attribute=noreturn \ + -Wsuggest-attribute=pure -Wsuggest-attribute=format -Wnormalized=nfkc -Wconversion \ + -fstrict-aliasing -fstrict-overflow -fipa-pure-const -ftree-vrp -fstack-usage \ + -funsafe-loop-optimizations +# excluded: -Wdeclaration-after-statement -nodebug: - gcc -o "hungarian"{,.c} + +all: hungarian + +hungarian: hungarian.c + gcc -std=c99 $(OPTIMISE) $(WARN) -o $@ $< test: ./"hungarian" @@ -11,8 +24,8 @@ valgrind: valgrind --tool=memcheck --leak-check=full ./"hungarian" clean: - if [ -f "hungarian" ]; then unlink "hungarian"; fi + -rm - hungarian -.PHONY: test valgrind clean +.PHONY: all test valgrind clean diff --git a/hungarian.c b/hungarian.c index 5c82db3..cac5211 100644 --- a/hungarian.c +++ b/hungarian.c @@ -127,7 +127,7 @@ void BitSet_set(BitSet this, long i); void BitSet_unset(BitSet this, long i); long BitSet_any(BitSet this); -long lb(llong x); +long lb(llong x) __attribute__((const)); @@ -136,8 +136,8 @@ void print(cell** t, long n, long m, long** assignment); int main(int argc, char** argv) { unsigned a, d; - asm("cpuid"); - asm volatile("rdtsc" : "=a" (a), "=d" (d)); + __asm__("cpuid"); + __asm__ __volatile__("rdtsc" : "=a" (a), "=d" (d)); srand(((llong)a) | (((llong)d) << 32LL)); |