diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2011-10-15 09:44:07 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2011-10-15 09:44:07 +0000 |
| commit | 854afdd4e98b8cd93645926b02aba9e33a98e8c3 (patch) | |
| tree | 14db630acccf262507f636f6daa44bbab08cdf89 | |
| parent | ce4946768c5f295b8e11d6e3c420ac9d8f83f8ca (diff) | |
Reverted most of previous change re: local labels in AMD64/MacOSX.
The wretched MacOSX "ld -shared" (under 10.6 at least) balks on
subtracting two local labels, while it deigns subtracting two
nonlocal labels.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11224 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | asmcomp/amd64/emit.mlp | 7 |
2 files changed, 1 insertions, 7 deletions
@@ -19,7 +19,6 @@ Compilers: Native-code compiler: - Optimized handling of partially-applied functions (PR#5287) -- AMD64/MacOSX code generator: make local asm labels really local. Standard library: - Added float functions "hypot" and "copysign" (PR#3806, PR#4752, PR#5246) diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp index f8810c82d..473c63432 100644 --- a/asmcomp/amd64/emit.mlp +++ b/asmcomp/amd64/emit.mlp @@ -82,13 +82,8 @@ let load_symbol_addr s = (* Output a label *) -let label_prefix = - match Config.system with - | "macosx" -> "L" - | _ -> ".L" - let emit_label lbl = - emit_string label_prefix; emit_int lbl + emit_string ".L"; emit_int lbl (* Output a .align directive. *) |