New patches: [fixes for android John Meacham **20120213150333 Ignore-this: cf6df59b212e3402ec21507410485270 ] hunk ./rts/rts/profile.c 1 +#if defined(__WIN32__) +#define HAVE_TIMES 0 +#else +#define HAVE_TIMES 1 +#endif + #include #include hunk ./rts/rts/profile.c 9 +#if HAVE_TIMES #include #include hunk ./rts/rts/profile.c 12 +#endif #include #include "rts/gc.h" hunk ./rts/rts/profile.c 31 fprintf(file, "SAMPLE_UNIT \"seconds\"\n"); fprintf(file, "VALUE_UNIT \"%s\"\n", value_unit ? value_unit : "bytes"); } -#if defined(__WIN32__) || defined(__ARM_EABI__) -struct tms {}; -#endif hunk ./rts/rts/profile.c 32 +#if HAVE_TIMES struct profile_stack { struct tms tm_total; struct tms tm_pushed; hunk ./rts/rts/profile.c 65 #endif return; } +#else + +struct profile_stack; +void jhc_profile_push(struct profile_stack *ps) {} +void jhc_profile_pop(struct profile_stack *ps) {} + +#endif void A_COLD jhc_print_profile(void) { hunk ./rts/rts/profile.c 82 fprintf(stderr, "Complie: %s\n", jhc_c_compile); fprintf(stderr, "Version: %s\n\n", jhc_version); jhc_alloc_print_stats(); -#ifndef __WIN32__ +#if HAVE_TIMES struct tms tm; times(&tm); print_times(&tm); hunk ./rts/rts/rts_support.c 68 jhc_hs_init(); hs_set_argv(*argc,*argv); #if JHC_isPosix - struct utsname jhc_utsname; if(!uname(&jhc_utsname)) { jhc_options_arch = jhc_utsname.machine; hunk ./rts/test/slab_test.c 11 #define _JHC_GC _JHC_GC_JGC #include "jhc_rts_header.h" -#include "jhc_jgc.h" -#include "debug.c" -#include "jhc_rts_alloc.c" -#include "jhc_rts.c" -#include "profile.c" #include "jhc_rts2.c" hunk ./rts/test/slab_test.c 12 -#include "slub.c" -#include "jhc_jgc.c" #define NUM_CACHES 15 #define FACTOR (1 << 16) hunk ./rts/test/stableptr_test.c 11 #define _JHC_GC _JHC_GC_JGC #include "jhc_rts_header.h" -#include "jhc_jgc.h" -#include "debug.c" -#include "jhc_rts_alloc.c" -#include "jhc_rts.c" -#include "profile.c" #include "jhc_rts2.c" hunk ./rts/test/stableptr_test.c 12 -#include "slub.c" -#include "jhc_jgc.c" #include "rts/stableptr.c" #include "seatest.h" Context: [make += work with '-m' command line options John Meacham **20120213102300 Ignore-this: 36cb4039cd34ba73d2cc973b7c00798b ] [move jhc_rts_alloc to gc_none John Meacham **20120213100906 Ignore-this: 1c2e9028d72127acd5a448971266f627 ] [added rts/rts_support, cleaned up rts code. John Meacham **20120213070644 Ignore-this: 79533860331fbd02057748e3d1b81666 ] [make 'Requires' a simple set, include the calling convention with the requirements. John Meacham **20120212053838 Ignore-this: b7fa6f8ece79c96073d8638a876456de ] [move slub.c and jhc_jgc.* to rts directory John Meacham **20120212040246 Ignore-this: a40354544b8908732c733bf8a38e7e68 ] [add unit tests for stableptr John Meacham **20120212031148 Ignore-this: 17b41baeec806fb53ca2c10c6489097 ] [reorganize rts/ directory, add README for it John Meacham **20120212022718 Ignore-this: c8a9f067696233958757830b62a7264b ] [add rts/test directory John Meacham **20120212004706 Ignore-this: 1e6d0cb4ba809a1d6089d04704d5a60f ] [allow being explicit in export/import lists by specifying 'kind', 'class', 'type', or 'data'. add PTS rule to allow proper typing of Complex_ John Meacham **20120211052157 Ignore-this: 12155286186022f896d3474a2bb5d23a ] [fix Options.hs makefile dependency John Meacham **20120211024909 Ignore-this: a0742d7ce4eba41314741b6ca2d6498d ] [added user defined kind extension John Meacham **20120211042248 Ignore-this: ded329985c5c81aa8c4612f7aa19559b ] [Add missing src/Options.hs to jhc tarball Sergei Trofimovich **20120209065334 Ignore-this: dfc50115ee26986ab2d303a462cd29b9 ] [added mingw32-gcc to MINGW search Sergei Trofimovich **20110414073938 Ignore-this: 87fa46f0e4532663a9d92930c9c38152 ] [add c-- types for complex and vector values John Meacham **20120210051026 Ignore-this: 4a1e4c8cec01f73b75913622c22fa55 ] [add documentation for the multi-return ccall extension, clean up code. John Meacham **20120209201351 Ignore-this: 47504b653ee9f71bde40e91959238292 ] [add extension to allow multiple return values from c functions John Meacham **20120209142228 Ignore-this: 51e4a3f9ca80ff2eae7f21376f0a0992 ] [fix obscure error message for invalid instance reported by roman John Meacham **20120209114221 Ignore-this: 98d60e20cb63caaebbe1269887160b9f ] [remove APrim type, use Prim directly, clean up corresponding cruft. John Meacham **20120209104920 Ignore-this: 8a3fbeea72e7f52809a3468df2b8b228 ] [turn ExtType into a real abstract type John Meacham **20120209100704 Ignore-this: c802a07fee0f2461cca19aa28f99ff61 ] [add 'capi' foreign function call type, simplify type of E.FromHs monad, check for more FFI related errors John Meacham **20120209091611 Ignore-this: 1945b5336e6001d6da6cd63a77bd1efd ] [add md5lazyIO, check for bad paths in createTempFile John Meacham **20120209091527 Ignore-this: f9e5f0dafc9615d5c5c50cb49829c5a5 ] [add foreign types, interpret Ptr when creating external C types John Meacham **20120209090647 Ignore-this: c49bea3938e2edabda9d7528cfb1121a ] [Add some more exotic primitive ops, ffs,clz,ctz,byteswap,popcount,parity. John Meacham **20120209070848 Ignore-this: b61b1c08db35ccad33f24536b99913df ] [jhc.spec fixes John Meacham **20120209015329 Ignore-this: 64488edc34893a734f81b1c01c0b1ff4 ] [TAG 0.8.0 John Meacham **20120208020026 Ignore-this: 2d0d963331a43650879ae72d81ff62e8 ] Patch bundle hash: f804caad49f5c76c9c43ea7a315ae025405a368b