From 5061de9a365cd88307c9162c5a8558d1905b5d70 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Jun 2007 17:41:27 -0400 Subject: [PATCH] make size_t better approximate the reality Instead of "always unsigned long" go for "unsigned int unless -m64 is given, unsigned long otherwise". Add an option (-msize-long) forcing to unsigned long regardless. Make __SIZE_TYPE__ expansion match that. The thing is, addition of checks on comparisons make for very unhappy min() on (kernel) size_t and sizeof(something) on the targets where the former is unsigned int. Which is to say, more than half of them... AFAICS, the only place needing explicit -msize-long in CHECK_FLAGS is s390 (it's using unsigned long both for 31- and 64-bit). Signed-off-by: Al Viro --- lib.c | 10 +++++++++- target.c | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib.c b/lib.c index 7fea4742..efba3d41 100644 --- a/lib.c +++ b/lib.c @@ -325,6 +325,11 @@ static char **handle_switch_m(char *arg, char **next) max_int_alignment = 8; bits_in_pointer = 64; pointer_alignment = 8; + size_t_ctype = &ulong_ctype; + ssize_t_ctype = &long_ctype; + } else if (!strcmp(arg, "msize-long")) { + size_t_ctype = &ulong_ctype; + ssize_t_ctype = &long_ctype; } return next; } @@ -599,7 +604,10 @@ void create_builtin_stream(void) // it is "long unsigned int". In either case we can probably // get away with this. We need the #weak_define as cgcc will define // the right __SIZE_TYPE__. - add_pre_buffer("#weak_define __SIZE_TYPE__ long unsigned int\n"); + if (size_t_ctype == &ulong_ctype) + add_pre_buffer("#weak_define __SIZE_TYPE__ long unsigned int\n"); + else + add_pre_buffer("#weak_define __SIZE_TYPE__ unsigned int\n"); add_pre_buffer("#weak_define __STDC__ 1\n"); add_pre_buffer("#define __builtin_stdarg_start(a,b) ((a) = (__builtin_va_list)(&(b)))\n"); diff --git a/target.c b/target.c index 22e948e2..bf1bb8ff 100644 --- a/target.c +++ b/target.c @@ -3,8 +3,8 @@ #include "symbol.h" #include "target.h" -struct symbol *size_t_ctype = &ulong_ctype; -struct symbol *ssize_t_ctype = &long_ctype; +struct symbol *size_t_ctype = &uint_ctype; +struct symbol *ssize_t_ctype = &int_ctype; /* * For "__attribute__((aligned))" -- 2.11.4.GIT