Setting GlobalDirective in TargetAsmInfo by default rather than

providing a misleading facility. It's used once in the MIPS backend
and hardcoded as "\t.globl\t" everywhere else.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45676 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 7 insertions, 1 deletions

diff --git a/include/llvm/CallingConv.h b/include/llvm/CallingConv.h
index bb76defc26..8b6a01a0cf 100644
--- a/include/llvm/CallingConv.h
+++ b/include/llvm/CallingConv.h
@@ -57,7 +57,12 @@ namespace CallingConv {
     /// X86_FastCall - 'fast' analog of X86_StdCall. Passes first two arguments
     /// in ECX:EDX registers, others - via stack. Callee is responsible for
     /// stack cleaning.
-    X86_FastCall = 65
+    X86_FastCall = 65,
+
+    /// X86_Ocaml - This is a weird ABI used by Objective Caml. Formally, it
+    /// supports only one to six integer/address arguments, all in-reg. It also
+    /// supports tail call emission.
+    X86_Ocaml = 66
   };
 } // End CallingConv namespace
 
diff --git a/include/llvm/CodeGen/LinkAllCodegenComponents.h b/include/llvm/CodeGen/LinkAllCodegenComponents.h
index 48be5411bc..ac58035593 100644
--- a/include/llvm/CodeGen/LinkAllCodegenComponents.h
+++ b/include/llvm/CodeGen/LinkAllCodegenComponents.h
@@ -36,6 +36,7 @@ namespace {
 
       (void) llvm::createSimpleRegisterCoalescer();
       
+      (void) llvm::createOcamlCollector();
       (void) llvm::createShadowStackCollector();
       
       (void) llvm::createBURRListDAGScheduler(NULL, NULL, NULL);