MAJ portage Sparc

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@131 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Xavier Leroy 1995-07-20 08:30:16 +00:00
parent 907632029a
commit 6ee1e295c0
5 changed files with 12 additions and 12 deletions

View File

@ -338,7 +338,7 @@ let emit_instr i =
`{record_frame i.live} call _caml_call_gc\n`;
` mov {emit_int n}, %g4\n`;
` add %g6, 4, {emit_reg i.res.(0)}\n`;
`{emit_label lbl_cont}:`
`{emit_label lbl_cont}:\n`
end else begin
`{record_frame i.live} call _caml_alloc\n`;
` mov {emit_int n}, %g4\n`;
@ -353,7 +353,7 @@ let emit_instr i =
` nop\n`;
` call _caml_fast_modify\n`;
` mov {emit_reg i.arg.(0)}, %g1\n`;
`{emit_label lbl_continue}:`
`{emit_label lbl_continue}:\n`
end else begin
` call _caml_modify\n`;
` mov {emit_reg i.arg.(0)}, %g1\n`

View File

@ -231,13 +231,12 @@ let contains_calls = ref false
(* Calling the assembler and the archiver *)
let assemble_file infile outfile =
begin try
try
let sched = find_in_path !Config.load_path "scheduler_sparc" in
Sys.command (sched ^ " -dli " ^ infile)
Sys.command
(sched ^ " -dli " ^ infile ^ " && as -o " ^ outfile ^ " " ^ infile)
with Not_found ->
()
end;
Sys.command ("as -o " ^ outfile ^ " " ^ infile)
Sys.command ("as -o " ^ outfile ^ " " ^ infile)
let create_archive archive file_list =
Misc.remove_file archive;

View File

@ -90,7 +90,7 @@ beforedepend:: Lex/scanner.ml
$(BYTE_EXE) $(BYTE_KB) $(BYTE_GENLEX): ../camlc
$(BYTE_EXE): ../stdlib/stdlib.cma
$(CODE_EXE) $(CODE_KB) $(CODE_GENLEX): ../camlopt
$(CODE_EXE): ../stdlib/stdlib.cmxa
$(CODE_EXE): ../stdlib/stdlib.cmxa ../stdlib/libasmrun.a
clean::
rm -f *.byt *.out

View File

@ -1,5 +1,5 @@
case $1 in
test) $camlrun genlex Lex/testscanner.mll;;
bench) xtime -o /dev/null $camlrun genlex Lex/testscanner.mll;;
test) shift; $* Lex/testscanner.mll;;
bench) shift; xtime -o /dev/null -e /dev/null -repeat 3 $* Lex/testscanner.mll;;
esac

View File

@ -2,7 +2,8 @@
include ../Makefile.config
CFLAGS=-O -DNDEBUG $(CCCOMPFLAGS)
CC=$(NATIVECC)
CFLAGS=-O -DNDEBUG $(NATIVECCCOMPOPTS)
OBJS= closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \
skeleton.o symtab.o verbose.o warshall.o
@ -10,7 +11,7 @@ OBJS= closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \
all: camlyacc
camlyacc: $(OBJS)
$(CC) $(CCCOMPFLAGS) $(CCLINKFLAGS) -o camlyacc $(OBJS)
$(CC) $(CFLAGS) $(CCLINKFLAGS) -o camlyacc $(OBJS)
clean:
rm -f *.o camlyacc *~