diff --git a/TODO b/TODO
index b120ee7..ea05cc3 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,11 @@
 TODO list:
 
+- bug with defines:
+    #define spin_lock(lock) do { } while (0)
+    #define wq_spin_lock spin_lock
+    #define TEST() wq_spin_lock(a)
+- see bugfixes.diff + improvement.diff from Daniel Glockner
+- constructors
 - cast bug (Peter Wang)
 - define incomplete type if defined several times (Peter Wang).
 - long long constant evaluation
@@ -13,7 +19,6 @@ TODO list:
 - '-b' bug.
 - atexit (Nigel Horne)
 - see -lxxx bug (Michael Charity).
-- handle inline functions as macros.
 - see transparent union pb in /urs/include/sys/socket.h
 - precise behaviour of typeof with arrays ? (__put_user macro)
 - #include_next support for /usr/include/limits ?
diff --git a/tcc-doc.texi b/tcc-doc.texi
index 7379434..9fa957e 100644
--- a/tcc-doc.texi
+++ b/tcc-doc.texi
@@ -58,6 +58,9 @@ these checks even if non patched libraries are used.
 With @code{libtcc}, you can use TCC as a backend for dynamic code
 generation (@pxref{Libtcc}).
 
+TCC mainly supports the i386 target. There are alpha ports for the ARM
+(@code{arm-tcc}) and the TMS320C67xx targets (@code{c67-tcc}).
+
 @node Invoke
 @chapter Command line invocation
 
@@ -211,6 +214,9 @@ Let the @code{char} type be unsigned.
 @item -fsigned-char
 Let the @code{char} type be signed.
 
+@item -fno-common
+Do not generate common symbols for uninitialized data.
+
 @end table
 
 Warning options:
@@ -272,6 +278,20 @@ opened with @code{dlopen()} needs to access executable symbols.
 Generate an object file combining all input files (@option{-o} option must
 also be given).
 
+@item -Wl,-Ttext,address
+Set the start of the .text section to @var{address}.
+
+@item -Wl,--oformat,fmt
+Use @var{fmt} as output format. The supported output formats are:
+@table @code
+@item elf32-i386
+ELF output format (default)
+@item binary
+Binary image (only for executable output)
+@item coff
+COFF output format (only for executable output for TMS320C67xx target)
+@end table
+
 @end table
 
 Debugger options:
@@ -628,6 +648,12 @@ supported:
 @item .text
 @item .data
 @item .bss
+@item .fill repeat[,size[,value]]
+@item .org n
+@item .previous
+@item .string string[,...]
+@item .asciz string[,...]
+@item .ascii string[,...]
 @end itemize
 
 @section X86 Assembler