Permalink
Browse files

PR#5712: (6) document OCAMLRUNPARAM flag R

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13199 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
  • Loading branch information...
1 parent e843406 commit 06630a0bdfa081a139cad5bfcdbbddad5bc5e0e7 doligez committed Jan 3, 2013
View
1 Makefile
@@ -799,6 +799,7 @@ alldepend:: depend
distclean:
./build/distclean.sh
+ rm -f ocaml ocamlcomp.sh testsuite/_log
.PHONY: all backup bootstrap camlp4opt camlp4out checkstack clean
.PHONY: partialclean beforedepend alldepend cleanboot coldstart
View
11 byterun/startup.c
@@ -307,19 +307,20 @@ static void parse_camlrunparam(void)
if (opt != NULL){
while (*opt != '\0'){
switch (*opt++){
- case 's': scanmult (opt, &minor_heap_init); break;
- case 'i': scanmult (opt, &heap_chunk_init); break;
+ case 'a': scanmult (opt, &p); caml_set_allocation_policy (p); break;
+ case 'b': caml_record_backtrace(Val_true); break;
case 'h': scanmult (opt, &heap_size_init); break;
+ case 'i': scanmult (opt, &heap_chunk_init); break;
case 'l': scanmult (opt, &max_stack_init); break;
case 'o': scanmult (opt, &percent_free_init); break;
case 'O': scanmult (opt, &max_percent_free_init); break;
- case 'v': scanmult (opt, &caml_verb_gc); break;
- case 'b': caml_record_backtrace(Val_true); break;
case 'p': caml_parser_trace = 1; break;
- case 'a': scanmult (opt, &p); caml_set_allocation_policy (p); break;
+ /* case 'R': see stdlib/hashtbl.mli */
+ case 's': scanmult (opt, &minor_heap_init); break;
#ifdef DEBUG
case 't': caml_trace_flag = 1; break;
#endif
+ case 'v': scanmult (opt, &caml_verb_gc); break;
}
}
}
View
3 testsuite/makefiles/Makefile.one
@@ -56,4 +56,5 @@ run:
promote: defaultpromote
clean: defaultclean
- @rm -f *.result ./program.* $(GENERATED_SOURCES) $(O_FILES)
+ @rm -f *.result ./program.* $(GENERATED_SOURCES) $(O_FILES) \
+ $(TEST_TEMP_FILES)
View
1 testsuite/tests/lib-dynlink-native/Makefile
@@ -89,5 +89,6 @@ clean: defaultclean
@rm -f result *.so *.o *.cm* main main_ext *.exe *.s *.asm *.obj
@rm -f *.a *.lib
@rm -f sub/*.so sub/*.o sub/*.cm* sub/*.s sub/*.asm sub/*.obj
+ @rm -f marshal.data
include $(BASEDIR)/makefiles/Makefile.common
View
1 testsuite/tests/lib-scanf/Makefile
@@ -15,6 +15,7 @@ BASEDIR=../..
MAIN_MODULE=tscanf
ADD_COMPFLAGS=-I $(BASEDIR)/lib
ADD_MODULES=testing
+TEST_TEMP_FILES=tscanf_data
include $(BASEDIR)/makefiles/Makefile.one
include $(BASEDIR)/makefiles/Makefile.common

0 comments on commit 06630a0

Please sign in to comment.