Merge branch 'master' into dwarf

5 files changed, 18 insertions, 7 deletions

diff --git a/backend/PrintXTL.ml b/backend/PrintXTL.ml
index 08ccf129..b9813db0 100644
--- a/backend/PrintXTL.ml
+++ b/backend/PrintXTL.ml
@@ -102,6 +102,9 @@ let print_instruction pp succ = function
   | Xbuiltin(ef, args, res) ->
       fprintf pp "%a = %s(%a)"
         vars res (name_of_external ef) vars args
+  | Xannot(ef, args) ->
+      fprintf pp "%s(%a)"
+        (name_of_external ef) (print_annot_args var) args
   | Xbranch s ->
       print_succ pp s succ
   | Xcond(cond, args, s1, s2) ->
diff --git a/backend/RTLgenaux.ml b/backend/RTLgenaux.ml
index 27a4908e..40bb5c41 100644
--- a/backend/RTLgenaux.ml
+++ b/backend/RTLgenaux.ml
@@ -73,6 +73,7 @@ let rec size_stmt = function
   | Stailcall(sg, eos, args) ->
       3 + size_eos eos + size_exprs args + length_exprs args
   | Sbuiltin(optid, ef, args) -> 1 + size_exprs args
+  | Sannot(txt, args) -> 0
   | Sseq(s1, s2) -> size_stmt s1 + size_stmt s2
   | Sifthenelse(ce, s1, s2) ->
       size_condexpr ce + max (size_stmt s1) (size_stmt s2)
diff --git a/backend/Stacking.v b/backend/Stacking.v
index c17dc038..21cf6b73 100644
--- a/backend/Stacking.v
+++ b/backend/Stacking.v
@@ -135,7 +135,7 @@ Fixpoint transl_annot_arg (fe: frame_env) (a: annot_arg loc) : annot_arg mreg :=
   | AA_base (R r) => AA_base r
   | AA_base (S Local ofs ty) =>
       AA_loadstack (chunk_of_type ty) (Int.repr (offset_of_index fe (FI_local ofs ty)))
-  | AA_base (S _ _ __) => AA_int Int.zero  (**r never happens *)
+  | AA_base (S _ _ _) => AA_int Int.zero  (**r never happens *)
   | AA_int n => AA_int n
   | AA_long n => AA_long n
   | AA_float n => AA_float n
diff --git a/configure b/configure
index ade46290..ffc1d0d3 100755
--- a/configure
+++ b/configure
@@ -95,7 +95,7 @@ case "$target" in
     esac
     system="linux"
     cc="${toolprefix}gcc"
-    cprepro="${toolprefix}gcc -U__GNUC__ -E"
+    cprepro="${toolprefix}gcc -std=c99 -U__GNUC__ -E"
     casm="${toolprefix}gcc -c"
     casmruntime="${toolprefix}gcc -c -Wa,-mregnames"
     clinker="${toolprefix}gcc"
@@ -140,7 +140,7 @@ case "$target" in
     struct_return="int1-4"
     system="linux"
     cc="${toolprefix}gcc"
-    cprepro="${toolprefix}gcc -U__GNUC__ '-D__REDIRECT(name,proto,alias)=name proto' '-D__REDIRECT_NTH(name,proto,alias)=name proto' -E"
+    cprepro="${toolprefix}gcc -std=c99 -U__GNUC__ '-D__REDIRECT(name,proto,alias)=name proto' '-D__REDIRECT_NTH(name,proto,alias)=name proto' -E"
     casm="${toolprefix}gcc -c"
     clinker="${toolprefix}gcc"
     libmath="-lm";;
@@ -152,7 +152,7 @@ case "$target" in
     struct_return="ref"
     system="linux"
     cc="${toolprefix}gcc -m32"
-    cprepro="${toolprefix}gcc -m32 -U__GNUC__ -E"
+    cprepro="${toolprefix}gcc -std=c99 -m32 -U__GNUC__ -E"
     casm="${toolprefix}gcc -m32 -c"
     clinker="${toolprefix}gcc -m32"
     libmath="-lm";;
@@ -164,7 +164,7 @@ case "$target" in
     struct_return="int1248"    # to check!
     system="bsd"
     cc="${toolprefix}gcc -m32"
-    cprepro="${toolprefix}gcc -m32 -U__GNUC__ -E"
+    cprepro="${toolprefix}gcc -std=c99 -m32 -U__GNUC__ -E"
     casm="${toolprefix}gcc -m32 -c"
     clinker="${toolprefix}gcc -m32"
     libmath="-lm";;
@@ -176,7 +176,7 @@ case "$target" in
     struct_return="int1248"
     system="macosx"
     cc="${toolprefix}gcc -arch i386"
-    cprepro="${toolprefix}gcc -arch i386 -U__GNUC__ -U__clang__ -U__BLOCKS__ '-D__attribute__(x)=' '-D__asm(x)=' -E"
+    cprepro="${toolprefix}gcc -std=c99 -arch i386 -U__GNUC__ -U__clang__ -U__BLOCKS__ '-D__attribute__(x)=' '-D__asm(x)=' -E"
     casm="${toolprefix}gcc -arch i386 -c"
     case `uname -r` in
       [1-9].*|10.*|11.*)    # up to MacOS 10.7 included
@@ -193,7 +193,7 @@ case "$target" in
     struct_return="ref"
     system="cygwin"
     cc="${toolprefix}gcc -m32"
-    cprepro="${toolprefix}gcc -m32 -U__GNUC__ -E"
+    cprepro="${toolprefix}gcc -std=c99 -m32 -U__GNUC__ -E"
     casm="${toolprefix}gcc -m32 -c"
     clinker="${toolprefix}gcc -m32"
     libmath="-lm";;
diff --git a/cparser/Lexer.mll b/cparser/Lexer.mll
index 13c1248b..82e6589c 100644
--- a/cparser/Lexer.mll
+++ b/cparser/Lexer.mll
@@ -233,6 +233,11 @@ let hexadecimal_floating_constant =
   | hexadecimal_prefix (hexadecimal_digit_sequence as intpart)
         binary_exponent_part floating_suffix?
 
+(* Preprocessing numbers *)
+let preprocessing_number =
+  '.'? ['0'-'9']
+  (['0'-'9' 'A'-'Z' 'a'-'z' '_' '.'] | ['e' 'E' 'p' 'P']['+' '-'])*
+
 (* Character and string constants *)
 let simple_escape_sequence =
   '\\' ( ['\''  '\"'  '?'  '\\'  'a'  'b'  'e'  'f'  'n'  'r'  't'  'v'] as c)
@@ -273,6 +278,8 @@ rule initial = parse
                                            | None -> None
                                            | Some c -> Some (String.make 1 c) },
                                       currentLoc lexbuf)}
+  | preprocessing_number as s     { error lexbuf "invalid numerical constant '%s'@ These characters form a preprocessor number, but not a constant" s;
+                                    CONSTANT (Cabs.CONST_INT "0", currentLoc lexbuf) }
   | "'"                           { let l = char_literal [] lexbuf in
                                     CONSTANT (Cabs.CONST_CHAR(false, l),
                                               currentLoc lexbuf) }