Index: arch/typesize.c ================================================================== --- arch/typesize.c +++ arch/typesize.c @@ -1,20 +1,21 @@ #include #include #include -#ifndef _emit_m4_include -# define sflag(flag,val) printf("-D"#flag"=\"%s\" ", val) -# define mflag(flag,val) printf("-D"#flag"=-%llu ", val + 1) -# define iflag(flag,val) printf("-D"#flag"=%llu ", val) -# define fflag(flag,val) printf("-D"#flag"=%Lf ", val) +#ifdef _emit_m4_include +# define sflag(flag,val) printf("define(`"#flag"',`%s')dnl\n", val) +# define mflag(flag,val) printf("define(`"#flag"',`%llu')dnl\n", (long long unsigned)(val + 1)) +# define iflag(flag,val) printf("define(`"#flag"',`%llu')dnl\n", (long long unsigned)val) +# define fflag(flag,val) printf("define(`"#flag"',`%Lf')dnl\n", val) #else -# define sflag(flag,val) printf("define(`"#flag"',`%s')dnl\n", val) -# define mflag(flag,val) printf("define(`"#flag"',`%llu')dnl\n", val + 1) -# define iflag(flag,val) printf("define(`"#flag"',`%llu')dnl\n", val) -# define fflag(flag,val) printf("define(`"#flag"',`%Lf')dnl\n", val) +# define sflag(flag,val) printf("-D"#flag"=\"%s\" ", val) +# define mflag(flag,val) printf("-D"#flag"=-%llu ", (long long unsigned)(val + 1)) +# define iflag(flag,val) printf("-D"#flag"=%llu ", (long long unsigned)val) +# define fflag(flag,val) printf("-D"#flag"=%Lf ", val) #endif + #define type_found(val) (found_type & (val / 8)) #define checkbits(type,x) \ if(!type_found(x) && sizeof(type) == (x/CHAR_BIT)) \ sflag(type_bit##x, #type), found_type |= (x / 8) Index: build.sh ================================================================== --- build.sh +++ build.sh @@ -170,11 +170,11 @@ say "commencing libk build $build at $(timestamp)" # set -x # get type data mkdir -p $gen -$cc -D_emit_m4_include arch/typesize.c -o $gen/typesize +report $cc -D_emit_m4_include arch/typesize.c -o $gen/typesize $gen/typesize > gen/typesize.m # generate syscall tables if test $posix = yes; then # on posix, we simply abuse CPP to garner a list of syscalls;