| @@ -1,70 +1,70 @@ | | | @@ -1,70 +1,70 @@ |
1 | $NetBSD: patch-aa,v 1.2 2008/12/17 16:59:19 joerg Exp $ | | 1 | $NetBSD: patch-aa,v 1.3 2009/08/18 19:01:26 hasso Exp $ |
2 | | | 2 | |
3 | --- Makefile.orig 2008-12-01 18:57:31.000000000 +0100 | | 3 | --- Makefile.orig 2009-05-15 15:14:07 +0300 |
4 | +++ Makefile | | 4 | +++ Makefile 2009-08-08 15:00:51 +0300 |
5 | @@ -8,18 +8,18 @@ BUILDDIR ?= build | | 5 | @@ -8,18 +8,18 @@ BUILDDIR ?= build |
6 | FIRM_CFLAGS ?= `pkg-config --cflags libfirm` | | 6 | FIRM_CFLAGS ?= `pkg-config --cflags libfirm` |
7 | FIRM_LIBS ?= `pkg-config --libs libfirm` | | 7 | FIRM_LIBS ?= `pkg-config --libs libfirm` |
8 | | | 8 | |
9 | -CPPFLAGS = -DHAVE_CONFIG_H -DFIRM_BACKEND | | 9 | -CPPFLAGS = -DHAVE_CONFIG_H -DFIRM_BACKEND |
10 | +CPPFLAGS += -DHAVE_CONFIG_H -DFIRM_BACKEND | | 10 | +CPPFLAGS += -DHAVE_CONFIG_H -DFIRM_BACKEND |
11 | CPPFLAGS += -I. | | 11 | CPPFLAGS += -I. |
12 | CPPFLAGS += $(FIRM_CFLAGS) | | 12 | CPPFLAGS += $(FIRM_CFLAGS) |
13 | | | 13 | |
14 | CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Werror -std=c99 -pedantic | | 14 | CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Werror -std=c99 -pedantic |
15 | -CFLAGS += -O0 -g3 | | 15 | -CFLAGS += -O0 -g3 |
16 | +CFLAGS += ${COPTS} ${DBG} | | 16 | +CFLAGS += ${COPTS} ${DBG} |
17 | #CFLAGS += -O3 -march=pentium4 -fomit-frame-pointer -DNDEBUG | | 17 | #CFLAGS += -O3 -march=pentium4 -fomit-frame-pointer -DNDEBUG |
18 | #CFLAGS += -pg -O3 -fno-inline | | 18 | #CFLAGS += -pg -O3 -fno-inline |
19 | -ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror | | 19 | -ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror |
20 | +#ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror | | 20 | +#ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror |
21 | #LFLAGS += -pg | | 21 | #LFLAGS += -pg |
22 | -ICC ?= true | | 22 | -ICC ?= true |
23 | -GCCO1 ?= true | | 23 | -GCCO1 ?= true |
24 | +#ICC ?= true | | 24 | +#ICC ?= true |
25 | +#GCCO1 ?= true | | 25 | +#GCCO1 ?= true |
26 | | | 26 | |
27 | LFLAGS += $(FIRM_LIBS) | | 27 | LFLAGS += $(FIRM_LIBS) |
28 | | | 28 | |
29 | @@ -55,13 +55,13 @@ SOURCES := \ | | 29 | @@ -57,13 +57,13 @@ SOURCES := \ |
30 | driver/gen_firm_asm.c \ | | 30 | wrappergen/write_fluffy.c \ |
31 | preprocessor.c | | 31 | wrappergen/write_jna.c |
32 | | | 32 | |
33 | -OBJECTS = $(SOURCES:%.c=build/%.o) | | 33 | -OBJECTS = $(SOURCES:%.c=build/%.o) |
34 | +OBJECTS = $(SOURCES:%.c=build/%.lo) | | 34 | +OBJECTS = $(SOURCES:%.c=build/%.lo) |
35 | | | 35 | |
36 | SPLINTS = $(addsuffix .splint, $(SOURCES)) | | 36 | SPLINTS = $(addsuffix .splint, $(SOURCES)) |
37 | CPARSERS = $(addsuffix .cparser, $(SOURCES)) | | 37 | CPARSERS = $(addsuffix .cparser, $(SOURCES)) |
38 | -CPARSEROS = $(SOURCES:%.c=build/cpb/%.o) | | 38 | -CPARSEROS = $(SOURCES:%.c=build/cpb/%.o) |
39 | -CPARSEROS_E = $(SOURCES:%.c=build/cpbe/%.o) | | 39 | -CPARSEROS_E = $(SOURCES:%.c=build/cpbe/%.o) |
40 | -CPARSEROS2 = $(SOURCES:%.c=build/cpb2/%.o) | | 40 | -CPARSEROS2 = $(SOURCES:%.c=build/cpb2/%.o) |
41 | +CPARSEROS = $(SOURCES:%.c=build/cpb/%.lo) | | 41 | +CPARSEROS = $(SOURCES:%.c=build/cpb/%.lo) |
42 | +CPARSEROS_E = $(SOURCES:%.c=build/cpbe/%.lo) | | 42 | +CPARSEROS_E = $(SOURCES:%.c=build/cpbe/%.lo) |
43 | +CPARSEROS2 = $(SOURCES:%.c=build/cpb2/%.lo) | | 43 | +CPARSEROS2 = $(SOURCES:%.c=build/cpb2/%.lo) |
44 | | | 44 | |
45 | Q = @ | | 45 | Q = @ |
46 | | | 46 | |
47 | @@ -97,7 +97,8 @@ UNUSED := $(shell mkdir -p $(DIRS)) | | 47 | @@ -99,7 +99,8 @@ UNUSED := $(shell mkdir -p $(DIRS)) |
48 | | | 48 | |
49 | $(GOAL): $(OBJECTS) $(LIBFIRM_FILE) | | 49 | $(GOAL): $(OBJECTS) $(LIBFIRM_FILE) |
50 | @echo "===> LD $@" | | 50 | @echo "===> LD $@" |
51 | - $(Q)$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL) | | 51 | - $(Q)$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL) |
52 | + $(Q)$(LIBTOOL) --mode=link --tag=CC \ | | 52 | + $(Q)$(LIBTOOL) --mode=link --tag=CC \ |
53 | + $(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL) | | 53 | + $(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL) |
54 | | | 54 | |
55 | splint: $(SPLINTS) | | 55 | splint: $(SPLINTS) |
56 | | | 56 | |
57 | @@ -127,35 +128,42 @@ builtins.h: builtins/builtins.c create_b | | 57 | @@ -129,35 +130,42 @@ builtins.h: builtins/builtins.c create_b |
58 | | | 58 | |
59 | main.c: builtins.h | | 59 | main.c: builtins.h |
60 | | | 60 | |
61 | -build/cpb/%.o: %.c build/cparser | | 61 | -build/cpb/%.o: %.c build/cparser |
62 | +build/cpb/%.lo: %.c build/cparser | | 62 | +build/cpb/%.lo: %.c build/cparser |
63 | @echo '===> CPARSER $<' | | 63 | @echo '===> CPARSER $<' |
64 | - $(Q)./build/cparser $(CPPFLAGS) -std=c99 -Wall -g3 -c $< -o $@ | | 64 | - $(Q)./build/cparser $(CPPFLAGS) -std=c99 -Wall -g3 -c $< -o $@ |
65 | + $(Q)$(LIBTOOL) --mode=compile --tag=CC \ | | 65 | + $(Q)$(LIBTOOL) --mode=compile --tag=CC \ |
66 | + ./build/cparser $(CPPFLAGS) -std=c99 -Wall -g3 -c $< -o $@ | | 66 | + ./build/cparser $(CPPFLAGS) -std=c99 -Wall -g3 -c $< -o $@ |
67 | | | 67 | |
68 | -build/cpbe/%.o: %.c | | 68 | -build/cpbe/%.o: %.c |
69 | +build/cpbe/%.lo: %.c | | 69 | +build/cpbe/%.lo: %.c |
70 | @echo '===> ECCP $<' | | 70 | @echo '===> ECCP $<' |