Skip unnamed bitfield in descend_into_subtype() and advance_current_object().

[cparser] / Makefile

diff --git a/Makefile b/Makefile
index 1ed5445..2a96248 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,23 @@
--include config.mak
-
 GOAL = $(BUILDDIR)/cparser
 
 BUILDDIR ?= build
+variant  ?= debug# Different libfirm variants (debug, optimize, profile)
 
-FIRM_CFLAGS ?= `pkg-config --cflags libfirm`
-FIRM_LIBS   ?= `pkg-config --libs libfirm`
+FIRM_HOME   = libfirm
+FIRM_CPPFLAGS = -I$(FIRM_HOME)/include
+FIRM_LIBS   = -lm
+LIBFIRM_FILE = build/$(variant)/libfirm.a
+FIRM_VERSION = 1.19.1
+FIRM_URL = http://downloads.sourceforge.net/project/libfirm/libfirm/$(FIRM_VERSION)/libfirm-$(FIRM_VERSION).tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Flibfirm%2Ffiles%2Flibfirm%2F&ts=1299786346&use_mirror=ignum
 
-CPPFLAGS  = -DHAVE_CONFIG_H -DFIRM_BACKEND
-CPPFLAGS += -I.
-CPPFLAGS += $(FIRM_CFLAGS)
+CPPFLAGS  = -I.
+CPPFLAGS += $(FIRM_CPPFLAGS)
 
-CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Werror -std=c99 -pedantic
-CFLAGS += -O0 -g3
+CFLAGS += -Wall -W -Wstrict-prototypes -Wmissing-prototypes -std=c99 -pedantic
+CFLAGS += -O2 -g
 #CFLAGS += -O3 -march=pentium4 -fomit-frame-pointer -DNDEBUG
 #CFLAGS += -pg -O3 -fno-inline
-ICC_CFLAGS = -O0 -g3 -std=c99 -Wall -Werror
+ICC_CFLAGS = -O0 -g3 -std=c99 -Wall
 #LFLAGS += -pg
 ICC    ?= true
 GCCO1  ?= true
@@ -24,23 +26,20 @@ LFLAGS += $(FIRM_LIBS)
 
 SOURCES := \
        adt/hashset.c \
-       adt/obstack.c \
-       adt/obstack_printf.c \
        adt/strset.c \
-       adt/xmalloc.c \
        attribute.c \
        parser.c \
        ast.c \
        ast2firm.c \
        builtins.c \
        diagnostic.c \
-       driver/firm_cmdline.c \
-       driver/firm_codegen.c \
+       driver/firm_machine.c \
        driver/firm_opt.c \
        driver/firm_timing.c \
        entity.c \
        entitymap.c \
        format_check.c \
+       input.c \
        lexer.c \
        main.c \
        mangle.c \
@@ -51,9 +50,9 @@ SOURCES := \
        type.c \
        type_hash.c \
        types.c \
-       walk_statements.c \
+       help.c \
        warning.c \
-       wrappergen/write_caml.c \
+       walk.c \
        wrappergen/write_fluffy.c \
        wrappergen/write_jna.c
 
@@ -67,9 +66,9 @@ CPARSEROS2 = $(SOURCES:%.c=build/cpb2/%.o)
 
 Q = @
 
-all: $(DIRS) $(GOAL)
+all: $(GOAL)
 
-.PHONY: all clean dirs bootstrap bootstrap2
+.PHONY: all clean bootstrap bootstrap2 $(FIRM_HOME)/$(LIBFIRM_FILE)
 
 ifeq ($(findstring $(MAKECMDGOALS), clean depend),)
 -include .depend
@@ -81,9 +80,10 @@ config.h:
 %.h:
        @true
 
-REVISION ?= $(shell svnversion -n .)
+REVISION ?= $(shell git describe --always --dirty --match '')
 
-.depend: config.h $(SOURCES)
+revision.h:
+       @echo "===> GEN $@"
        @echo "#define cparser_REVISION \"$(REVISION)\"" > .revision.h
        $(Q)if diff -Nq .revision.h revision.h > /dev/null; then \
              rm .revision.h;                                    \
@@ -91,15 +91,26 @@ REVISION ?= $(shell svnversion -n .)
              echo "===> UPDATING revision.h";                   \
              mv .revision.h revision.h;                         \
            fi
+
+.depend: config.h revision.h $(SOURCES)
        @echo "===> DEPEND"
        @rm -f $@ && touch $@ && makedepend -p "$@ build/" -Y -f $@ -- $(CPPFLAGS) -- $(SOURCES) 2> /dev/null && rm $@.bak
 
 DIRS = build build/adt build/driver build/wrappergen build/cpb build/cpb/adt build/cpb/driver build/cpb/wrappergen build/cpb2 build/cpb2/adt build/cpb2/driver build/cpb2/wrappergen build/cpbe build/cpbe/adt build/cpbe/driver build/cpbe2/wrappergen
 UNUSED := $(shell mkdir -p $(DIRS))
 
-$(GOAL): $(OBJECTS) $(LIBFIRM_FILE)
+$(FIRM_HOME)/$(LIBFIRM_FILE):
+ifeq "$(wildcard $(FIRM_HOME) )" ""
+       @echo 'Download and extract libfirm tarball ...'
+       $(Q)curl -s -L "${FIRM_URL}" -o "libfirm-$(FIRM_VERSION).tar.bz2"
+       $(Q)tar xf "libfirm-$(FIRM_VERSION).tar.bz2"
+       $(Q)mv "libfirm-$(FIRM_VERSION)" libfirm
+endif
+       cd libfirm && $(MAKE) $(LIBFIRM_FILE)
+
+$(GOAL): $(FIRM_HOME)/$(LIBFIRM_FILE) $(OBJECTS)
        @echo "===> LD $@"
-       $(Q)$(CC) $(OBJECTS) $(LFLAGS) -o $(GOAL)
+       $(Q)$(CC) $(OBJECTS) $(LFLAGS) $(FIRM_HOME)/$(LIBFIRM_FILE) -o $(GOAL)
 
 splint: $(SPLINTS)
 
@@ -119,16 +130,6 @@ bootstrap2: build/cpb2 build/cpb2/adt build/cpb2/driver $(CPARSEROS2) cparser.bo
        @echo '===> CPARSER $<'
        $(Q)./cparser $(CPPFLAGS) -fsyntax-only $<
 
-$(DIRS):
-       @echo "===> MKDIR $@"
-       $(Q)mkdir -p $@
-
-gen_builtins.h: builtins/builtins.c create_builtins_h.sh
-       @echo '===> CREATE_BUILTINS $<'
-       $(Q)./create_builtins_h.sh "$<" > $@
-
-main.c: gen_builtins.h
-
 build/cpb/%.o: %.c build/cparser
        @echo '===> CPARSER $<'
        $(Q)./build/cparser $(CPPFLAGS) -std=c99 -Wall -g3 -c $< -o $@
@@ -161,4 +162,4 @@ build/%.o: %.c
 
 clean:
        @echo '===> CLEAN'
-       $(Q)rm -rf builtins.h build/* $(GOAL) .depend
+       $(Q)rm -rf build/* $(GOAL) .depend