xform: updates for recent MinGW

This commit is contained in:
Matthew Flatt 2018-10-28 12:35:01 -06:00
parent b5084977c0
commit dbcc9dddc3
3 changed files with 14 additions and 5 deletions

View File

@ -892,7 +892,7 @@
= >>= <<= ^= += *= /= -= %= \|= &= ++ -- = >>= <<= ^= += *= /= -= %= \|= &= ++ --
return if for while else switch case XFORM_OK_ASSIGN return if for while else switch case XFORM_OK_ASSIGN
asm __asm __asm__ __volatile __volatile__ volatile __extension__ asm __asm __asm__ __volatile __volatile__ volatile __extension__
__typeof sizeof __builtin_object_size __typeof __typeof__ sizeof __builtin_object_size
;; These don't act like functions: ;; These don't act like functions:
setjmp longjmp _longjmp scheme_longjmp_setjmp scheme_mz_longjmp scheme_jit_longjmp setjmp longjmp _longjmp scheme_longjmp_setjmp scheme_mz_longjmp scheme_jit_longjmp
@ -913,7 +913,7 @@
__isinff __isinfl isnanf isinff __isinfd __isnanf __isnand __isinf __isinff128 __isinff __isinfl isnanf isinff __isinfd __isnanf __isnand __isinf __isinff128
__inline_isnanl __inline_isnan __inline_signbit __inline_signbitf __inline_signbitd __inline_signbitl __inline_isnanl __inline_isnan __inline_signbit __inline_signbitf __inline_signbitd __inline_signbitl
__builtin_popcount __builtin_clz __builtin_isnan __builtin_isinf __builtin_signbit __builtin_popcount __builtin_clz __builtin_isnan __builtin_isinf __builtin_signbit
__builtin_signbitf __builtin_signbitd __builtin_signbitl __builtin_isinf_sign __builtin_signbitf __builtin_signbitd __builtin_signbitl __builtin_isinf_sign __builtin_trap
_Generic _Generic
__inline_isinff __inline_isinfl __inline_isinfd __inline_isnanf __inline_isnand __inline_isinf __inline_isinff __inline_isinfl __inline_isinfd __inline_isnanf __inline_isnand __inline_isinf
floor floorl ceil ceill round roundl fmod fmodl modf modfl fabs fabsl __maskrune _errno __errno floor floorl ceil ceill round roundl fmod fmodl modf modfl fabs fabsl __maskrune _errno __errno
@ -938,7 +938,7 @@
non-functions) non-functions)
ht)) ht))
(define args-unevaled '(sizeof __typeof __builtin_object_size)) (define args-unevaled '(sizeof __typeof __typeof__ __builtin_object_size))
(define args-unevaled-table (define args-unevaled-table
(let ([ht (make-hasheq)]) (let ([ht (make-hasheq)])
(for-each (lambda (s) (for-each (lambda (s)
@ -1562,7 +1562,11 @@
(seq-close body-v) (seq-close body-v)
(list->seq (process-top-level (seq->list (seq-in body-v)) where can-drop-vars?)))) (list->seq (process-top-level (seq->list (seq-in body-v)) where can-drop-vars?))))
(cdddr e))] (cdddr e))]
[(and (eq? (tok-n (car e)) 'inline)
(pair? (cdr e))
(eq? (tok-n (cadr e)) 'namespace))
;; inline namespace is something we can ignore?
e]
[(typedef? e) [(typedef? e)
(when show-info? (when show-info?
(printf "/* TYPEDEF */\n")) (printf "/* TYPEDEF */\n"))

View File

@ -574,6 +574,11 @@ void operator delete(void * p)
free(p); free(p);
} }
void operator delete(void * p, unsigned long long)
{
free(p);
}
#endif #endif
#ifdef MZ_PRECISE_GC #ifdef MZ_PRECISE_GC

View File

@ -380,7 +380,7 @@ $(XSRCDIR)/main.c: $(XFORMDEP)
@INCLUDEDEP@ foreign.d @INCLUDEDEP@ foreign.d
@INCLUDEDEP@ main.d @INCLUDEDEP@ main.d
$(XSRCDIR)/mzobj.cxx: $(XFORMDEP) $(XSRCDIR)/mzobj.cxx: $(XFORMDEP) $(srcdir)/../../mzcom/mzobj.cxx
$(XFORM_NOPRECOMP) $(XSRCDIR)/mzobj.cxx $(DEF_C_DIRS) $(srcdir)/../../mzcom/mzobj.cxx $(XFORM_NOPRECOMP) $(XSRCDIR)/mzobj.cxx $(DEF_C_DIRS) $(srcdir)/../../mzcom/mzobj.cxx
salloc.@LTO@: $(XSRCDIR)/salloc.c salloc.@LTO@: $(XSRCDIR)/salloc.c