Removed unused sel_target, changed cygwin symbol names and changed the default function aligment to be target dependent.

5 files changed, 11 insertions, 7 deletions

diff --git a/arm/TargetPrinter.ml b/arm/TargetPrinter.ml
index 1d37d237..62dd2bc2 100644
--- a/arm/TargetPrinter.ml
+++ b/arm/TargetPrinter.ml
@@ -1120,7 +1120,8 @@ module Target (Opt: PRINTER_OPTIONS) : TARGET =
       fprintf oc "	.%s\n" (if !Clflags.option_mthumb then "thumb" else "arm")
 
     let print_epilogue oc = ()
-        
+
+    let default_falignment = 4
   end
 
 let sel_target () = 
diff --git a/backend/PrintAsm.ml b/backend/PrintAsm.ml
index c356d7e5..a6883339 100644
--- a/backend/PrintAsm.ml
+++ b/backend/PrintAsm.ml
@@ -20,8 +20,6 @@ open Printf
 open Sections
 open TargetPrinter
 
-module Target = (val (sel_target ()):TARGET) 
-
 module Printer(Target:TARGET) =
   struct
 
@@ -34,7 +32,7 @@ module Printer(Target:TARGET) =
       let (text, lit, jmptbl) = Target.get_section_names name in
       Target.section oc text;
       let alignment =
-        match !Clflags.option_falignfunctions with Some n -> n | None -> 4 in
+        match !Clflags.option_falignfunctions with Some n -> n | None -> Target.default_falignment in
       Target.print_align oc alignment;
       if not (C2C.atom_is_static name) then
         fprintf oc "	.globl %a\n" Target.symbol name;
diff --git a/backend/PrintAsmaux.ml b/backend/PrintAsmaux.ml
index 925add9e..64db2cb0 100644
--- a/backend/PrintAsmaux.ml
+++ b/backend/PrintAsmaux.ml
@@ -42,6 +42,7 @@ module type TARGET =
       val name_of_section: section_name -> string
       val comment: string
       val symbol: out_channel -> P.t -> unit
+      val default_falignment: int
     end
 
 (* On-the-fly label renaming *)
diff --git a/ia32/TargetPrinter.ml b/ia32/TargetPrinter.ml
index 55abe3b7..39f8be23 100644
--- a/ia32/TargetPrinter.ml
+++ b/ia32/TargetPrinter.ml
@@ -82,8 +82,9 @@ module Cygwin_System : SYSTEM =
 
     let raw_symbol oc s =
        fprintf oc "_%s" s
-
-    let symbol = elf_symbol
+        
+    let symbol oc symb =
+      raw_symbol oc (extern_atom symb)
 
     let label oc lbl =
        fprintf oc "L%d" lbl
@@ -179,7 +180,7 @@ module MacOS_System : SYSTEM =
      fprintf oc "_%s" s
 
     let symbol oc symb =
-      fprintf oc "_%s" (extern_atom symb)
+      raw_symbol oc (extern_atom symb)
 
     let label oc lbl =
       fprintf oc "L%d" lbl
@@ -967,6 +968,8 @@ module Target(System: SYSTEM):TARGET =
       System.print_epilogue oc
       
     let comment = comment
+
+    let default_falignment = 16
 end
 
 let sel_target () =
diff --git a/powerpc/TargetPrinter.ml b/powerpc/TargetPrinter.ml
index 964f75a7..70aec6c0 100644
--- a/powerpc/TargetPrinter.ml
+++ b/powerpc/TargetPrinter.ml
@@ -741,6 +741,7 @@ module Target (System : SYSTEM):TARGET =
         jumptables := []
       end
 
+    let default_falignment = 4
   end
 
 let sel_target () =