Fix build with GCC6

Add -P option to GCC preprocessor
Distinguish linemarkers and pragmas (both start with #)

Change-Id: I54e8674a5bcbc087da6a40c0571e9c3e4de3ef7f

diff --git a/utils/collect-symbols.c b/utils/collect-symbols.c
index 9b7b782035a20a0ee883630a0d002cea42fafd29..d4abaffbc8bdc631fe621f62aa0d25708a8fbcb1 100644 (file)
--- a/utils/collect-symbols.c
+++ b/utils/collect-symbols.c
@@ -292,9 +292,9 @@ static int preprocess_file(const char *preproc, const char *file,
         argv[argc++] = "-c";
 
         if (cflags != NULL)
-            snprintf(cmd, sizeof(cmd), "%s %s -E %s", preproc, cflags, file);
+            snprintf(cmd, sizeof(cmd), "%s %s -E -P %s", preproc, cflags, file);
         else
-            snprintf(cmd, sizeof(cmd), "%s -E %s", preproc, file);
+            snprintf(cmd, sizeof(cmd), "%s -E -P %s", preproc, file);
 
         argv[argc++] = cmd;
         argv[argc]   = NULL;
@@ -627,6 +627,11 @@ static int collect_tokens(input_t *in, ringbuf_t *rb, token_t *tokens,
 
             /* extract path name from preprocessor line-markers */
         case '#':
+            if (input_read(in) == 'p') {    /* p for pragma */
+                while((ch = input_read(in)) != '\n' && ch) {}
+                break;
+            }
+            /* not pragma, assume linemarker */
             v = input_parse_linemarker(in, path, sizeof(path));
             if (v != NULL) {
                 tokens[n].type  = TOKEN_LINEMARKER;