Move all predefined macros to ... predefined_macros()
Neater so, isn't it?
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@xxxxxxxxx>
---
lib.c | 112 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 56 insertions(+), 56 deletions(-)
diff --git a/lib.c b/lib.c
index 9271bc5cd..3cf602b37 100644
--- a/lib.c
+++ b/lib.c
@@ -1136,6 +1136,43 @@ static void predefined_type_size(const char *name, const char *suffix, unsigned
static void predefined_macros(void)
{
predefine("__CHECKER__", 0, "1");
+ predefinef("__GNUC__", 1, "%d", gcc_major);
+ predefinef("__GNUC_MINOR__", 1, "%d", gcc_minor);
+ predefinef("__GNUC_PATCHLEVEL__", 1, "%d", gcc_patchlevel);
+
+ predefine("__STDC__", 1, "1");
+ switch (standard) {
+ case STANDARD_C89:
+ predefine("__STRICT_ANSI__", 1, "1");
+ break;
+
+ case STANDARD_C94:
+ predefine("__STDC_VERSION__", 1, "199409L");
+ predefine("__STRICT_ANSI__", 1, "1");
+ break;
+
+ case STANDARD_C99:
+ predefine("__STDC_VERSION__", 1, "199901L");
+ predefine("__STRICT_ANSI__", 1, "1");
+ break;
+
+ case STANDARD_GNU89:
+ default:
+ break;
+
+ case STANDARD_GNU99:
+ predefine("__STDC_VERSION__", 1, "199901L");
+ break;
+
+ case STANDARD_C11:
+ predefine("__STRICT_ANSI__", 1, "1");
+ case STANDARD_GNU11:
+ predefine("__STDC_NO_ATOMICS__", 1, "1");
+ predefine("__STDC_NO_COMPLEX__", 1, "1");
+ predefine("__STDC_NO_THREADS__", 1, "1");
+ predefine("__STDC_VERSION__", 1, "201112L");
+ break;
+ }
predefined_sizeof("SHORT", bits_in_short);
predefined_max("SHRT", "", bits_in_short);
@@ -1167,6 +1204,15 @@ static void predefined_macros(void)
predefine("__LITTLE_ENDIAN__", 1, "1");
predefine("__BYTE_ORDER__", 1, "__ORDER_LITTLE_ENDIAN__");
}
+
+ if (optimize_level)
+ predefine("__OPTIMIZE__", 0, "1");
+ if (optimize_size)
+ predefine("__OPTIMIZE_SIZE__", 0, "1");
+
+ // Temporary hacks
+ predefine("__extension__", 0, NULL);
+ predefine("__pragma__", 0, NULL);
}
static void declare_builtin_functions(void)
@@ -1188,23 +1234,7 @@ static void declare_builtin_functions(void)
static void create_builtin_stream(void)
{
- predefinef("__GNUC__", 1, "%d", gcc_major);
- predefinef("__GNUC_MINOR__", 1, "%d", gcc_minor);
- predefinef("__GNUC_PATCHLEVEL__", 1, "%d", gcc_patchlevel);
-
- /* add the multiarch include directories, if any */
- if (multiarch_dir && *multiarch_dir) {
- add_pre_buffer("#add_system \"/usr/include/%s\"\n", multiarch_dir);
- add_pre_buffer("#add_system \"/usr/local/include/%s\"\n", multiarch_dir);
- }
-
- /* We add compiler headers path here because we have to parse
- * the arguments to get it, falling back to default. */
- add_pre_buffer("#add_system \"%s/include\"\n", gcc_base_dir);
- add_pre_buffer("#add_system \"%s/include-fixed\"\n", gcc_base_dir);
-
- predefine("__extension__", 0, NULL);
- predefine("__pragma__", 0, NULL);
+ // Temporary hack
add_pre_buffer("#define _Pragma(x)\n");
// gcc defines __SIZE_TYPE__ to be size_t. For linux/i86 and
@@ -1216,44 +1246,19 @@ static void create_builtin_stream(void)
add_pre_buffer("#weak_define __SIZE_TYPE__ long unsigned int\n");
else
add_pre_buffer("#weak_define __SIZE_TYPE__ unsigned int\n");
- predefine("__STDC__", 1, "1");
- switch (standard)
- {
- case STANDARD_C89:
- predefine("__STRICT_ANSI__", 1, "1");
- break;
- case STANDARD_C94:
- predefine("__STDC_VERSION__", 1, "199409L");
- predefine("__STRICT_ANSI__", 1, "1");
- break;
-
- case STANDARD_C99:
- predefine("__STDC_VERSION__", 1, "199901L");
- predefine("__STRICT_ANSI__", 1, "1");
- break;
-
- case STANDARD_GNU89:
- break;
-
- case STANDARD_GNU99:
- predefine("__STDC_VERSION__", 1, "199901L");
- break;
-
- case STANDARD_C11:
- predefine("__STRICT_ANSI__", 1, "1");
- case STANDARD_GNU11:
- predefine("__STDC_NO_ATOMICS__", 1, "1");
- predefine("__STDC_NO_COMPLEX__", 1, "1");
- predefine("__STDC_NO_THREADS__", 1, "1");
- predefine("__STDC_VERSION__", 1, "201112L");
- break;
-
- default:
- assert (0);
+ /* add the multiarch include directories, if any */
+ if (multiarch_dir && *multiarch_dir) {
+ add_pre_buffer("#add_system \"/usr/include/%s\"\n", multiarch_dir);
+ add_pre_buffer("#add_system \"/usr/local/include/%s\"\n", multiarch_dir);
}
+ /* We add compiler headers path here because we have to parse
+ * the arguments to get it, falling back to default. */
+ add_pre_buffer("#add_system \"%s/include\"\n", gcc_base_dir);
+ add_pre_buffer("#add_system \"%s/include-fixed\"\n", gcc_base_dir);
+
add_pre_buffer("#define __builtin_stdarg_start(a,b) ((a) = (__builtin_va_list)(&(b)))\n");
add_pre_buffer("#define __builtin_va_start(a,b) ((a) = (__builtin_va_list)(&(b)))\n");
add_pre_buffer("#define __builtin_ms_va_start(a,b) ((a) = (__builtin_ms_va_list)(&(b)))\n");
@@ -1265,11 +1270,6 @@ static void create_builtin_stream(void)
add_pre_buffer("#define __builtin_va_end(arg)\n");
add_pre_buffer("#define __builtin_ms_va_end(arg)\n");
add_pre_buffer("#define __builtin_va_arg_pack()\n");
-
- if (optimize_level)
- predefine("__OPTIMIZE__", 0, "1");
- if (optimize_size)
- predefine("__OPTIMIZE_SIZE__", 0, "1");
}
static struct symbol_list *sparse_tokenstream(struct token *token)
--
2.17.1
--
To unsubscribe from this list: send the line "unsubscribe linux-sparse" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
