Merge branch 'master' into test-suite

Conflicts:
	Makefile
	ir.c

diff --cc Makefile
index 89168d76aa7fa5c8142e3924794d421bb11a46fd,ad8c9411c7467b647c7e3ad2cb14de64bf07e0ff..aa5ef11f11b60b2f9955c596c60b522e78c4dde4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -28,9 -28,8 +28,10 @@@ OBJ     =             
            code.o      \
            ast.o       \
            ir.o        \
-           con.o
-           
+           con.o       \
+           ftepp.o
++
 +OBJ_T = test.o util.o con.o
  OBJ_C = main.o lexer.o parser.o
  OBJ_X = exec-standalone.o util.o con.o
  

diff --cc gmqcc.h
Simple merge

diff --cc main.c
Simple merge