on master help sign in
Merge pull request #635 from hannesm/cleanups
8856187Edwin Brady
config.mk+1−1
@@ -1,4 +1,4 @@
1−CC :=gcc
1+CC :=cc
2CABAL :=cabal
2CABAL :=cabal
3CFLAGS :=-O2 -Wall $(CFLAGS)
3CFLAGS :=-O2 -Wall $(CFLAGS)
4#CABALFLAGS :=
4#CABALFLAGS :=
rts/Makefile+1−3
@@ -5,9 +5,7 @@ OBJS = idris_rts.o idris_heap.o idris_gc.o idris_gmp.o idris_stdfgn.o \
5HDRS = idris_rts.h idris_heap.h idris_gc.h idris_gmp.h idris_stdfgn.h \
5HDRS = idris_rts.h idris_heap.h idris_gc.h idris_gmp.h idris_stdfgn.h \
6 idris_bitstring.h idris_opts.h idris_stats.h
6 idris_bitstring.h idris_opts.h idris_stats.h
7CFLAGS:=-fPIC $(CFLAGS)
7CFLAGS:=-fPIC $(CFLAGS)
8−ifneq ($(GMP_INCLUDE_DIR),)
9− CFLAGS += -isystem $(GMP_INCLUDE_DIR)
8+CFLAGS += $(GMP_INCLUDE_DIR)
10−endif
11
9
12LIBTARGET = libidris_rts.a
10LIBTARGET = libidris_rts.a
13
11
rts/idris_opts.c+5−5
@@ -6,7 +6,7 @@
6#include <string.h>
6#include <string.h>
7
7
8
8
9−char usage[] =
9+const char usage[] =
10 "\n" \
10 "\n" \
11 "Usage: <prog> [+RTS <rtsopts> -RTS] <args>\n\n" \
11 "Usage: <prog> [+RTS <rtsopts> -RTS] <args>\n\n" \
12 "Options:\n\n" \
12 "Options:\n\n" \
@@ -26,7 +26,7 @@ int read_size(char * str) {
26
26
27 int r = sscanf(str, "%u%c", &size, &mult);
27 int r = sscanf(str, "%u%c", &size, &mult);
28
28
29− if (r == 1)
29+ if (r == 1)
30 return size;
30 return size;
31
31
32 if (r == 2) {
32 if (r == 2) {
@@ -34,8 +34,8 @@ int read_size(char * str) {
34 case 'K': size = size << 10; break;
34 case 'K': size = size << 10; break;
35 case 'M': size = size << 20; break;
35 case 'M': size = size << 20; break;
36 case 'G': size = size << 30; break;
36 case 'G': size = size << 30; break;
37− default:
37+ default:
38− fprintf(stderr,
38+ fprintf(stderr,
39 "RTS Opts: Unable to recognize size suffix `%c'.\n" \
39 "RTS Opts: Unable to recognize size suffix `%c'.\n" \
40 " Possible suffixes are K or M or G.\n",
40 " Possible suffixes are K or M or G.\n",
41 mult);
41 mult);
@@ -58,7 +58,7 @@ int parse_args(RTSOpts * opts, int argc, char *argv[])
58
58
59 if (strcmp(argv[0], "+RTS") != 0)
59 if (strcmp(argv[0], "+RTS") != 0)
60 return 0;
60 return 0;
61−
61+
62 int i;
62 int i;
63 for (i = 1; i < argc; i++) {
63 for (i = 1; i < argc; i++) {
64 if (strcmp(argv[i], "-RTS") == 0) {
64 if (strcmp(argv[i], "-RTS") == 0) {