diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-01-12 14:20:31 +0100 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-01-12 14:20:31 +0100 |
| commit | 81e91f965e7b1afbea8d1630015e75f11f0a3afd (patch) | |
| tree | 270a85299f33d783e33745c917796f080f7300e1 /powerpc/PrintUtil.ml | |
| parent | 3304820b870e4524c7d1f14fcd62506634f7922b (diff) | |
| parent | 06841a5bb7ca27bc436e87e7991d0d05dbf5267c (diff) | |
| download | compcert-81e91f965e7b1afbea8d1630015e75f11f0a3afd.tar.gz compcert-81e91f965e7b1afbea8d1630015e75f11f0a3afd.zip | |
Merge branch 'master' into dwarf
Conflicts:
powerpc/PrintAsm.ml
Diffstat (limited to 'powerpc/PrintUtil.ml')
| -rw-r--r-- | powerpc/PrintUtil.ml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/powerpc/PrintUtil.ml b/powerpc/PrintUtil.ml index 500ff1a3..e007b273 100644 --- a/powerpc/PrintUtil.ml +++ b/powerpc/PrintUtil.ml @@ -28,8 +28,7 @@ module type SYSTEM = val freg: out_channel -> freg -> unit val creg: out_channel -> int -> unit val name_of_section: section_name -> string - val print_file_line: out_channel -> string -> string -> unit - val reset_file_line: unit -> unit + val print_file_line: out_channel -> string -> int -> unit val cfi_startproc: out_channel -> unit val cfi_endproc: out_channel -> unit val cfi_adjust: out_channel -> int32 -> unit |