Index: lld/ELF/Driver.cpp
===================================================================
--- lld/ELF/Driver.cpp
+++ lld/ELF/Driver.cpp
@@ -964,9 +964,19 @@
   std::tie(Config->AndroidPackDynRelocs, Config->RelrPackDynRelocs) =
       getPackDynRelocs(Args);
 
-  if (auto *Arg = Args.getLastArg(OPT_symbol_ordering_file))
-    if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue()))
-      Config->SymbolOrderingFile = getSymbolOrderingFile(*Buffer);
+  if (auto *Arg = Args.getLastArg(OPT_symbol_ordering_file,
+                                  OPT_call_graph_ordering_file)){
+    if (Arg->getOption().matches(OPT_symbol_ordering_file)){
+      // If --symbol-ordering-file comes later than
+      // --call-graph-order-file, set CallGraphProfileSort to false
+      // to ignore all call graph information, either from a flag or from
+      // cgprofile in object files.
+      if (Optional<MemoryBufferRef> Buffer = readFile(Arg->getValue())){
+        Config->SymbolOrderingFile = getSymbolOrderingFile(*Buffer);
+        Config->CallGraphProfileSort = false;
+      }
+    }
+  }
 
   // If --retain-symbol-file is used, we'll keep only the symbols listed in
   // the file and discard all others.
Index: lld/test/ELF/symbol-ordering-file-cgprofile-obj.s
===================================================================
--- /dev/null
+++ lld/test/ELF/symbol-ordering-file-cgprofile-obj.s
@@ -0,0 +1,57 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
+// RUN: ld.lld -e A %t1 --no-call-graph-profile-sort -o %t2
+// RUN: llvm-nm --numeric-sort %t2 | FileCheck %s --check-prefix=NO_ORDERING
+// NO_ORDERING:         0000000000201000 t D
+// NO_ORDERING-NEXT:    0000000000201001 T C
+// NO_ORDERING-NEXT:    0000000000201002 T B
+// NO_ORDERING-NEXT:    0000000000201003 T A	
+
+// RUN: ld.lld -e A %t1 -o %t2
+// RUN: llvm-nm --numeric-sort %t2 | FileCheck %s --check-prefix=CALL_GRAPH
+// CALL_GRAPH:		0000000000201000 T A
+// CALL_GRAPH-NEXT:	0000000000201000 t Aa
+// CALL_GRAPH-NEXT:	0000000000201001 T B
+// CALL_GRAPH-NEXT:	0000000000201002 T C
+// CALL_GRAPH-NEXT:	0000000000201003 t D
+
+// RUN: rm %t.symbol_order || true
+// RUN: echo "C" >> %t.symbol_order
+// RUN: echo "B" >> %t.symbol_order
+// RUN: echo "D" >> %t.symbol_order
+// RUN: echo "A" >> %t.symbol_order
+
+// RUN: ld.lld -e A %t1 --symbol-ordering-file %t.symbol_order -o %t2
+// RUN: llvm-nm --numeric-sort %t2 | FileCheck %s --check-prefix=SYMBOL_ORDER
+// SYMBOL_ORDER:	0000000000201000 T C
+// SYMBOL_ORDER-NEXT:	0000000000201001 T B
+// SYMBOL_ORDER-NEXT:	0000000000201002 t D
+// SYMBOL_ORDER-NEXT:	0000000000201003 T A
+
+    .section    .text.D,"ax",@progbits
+D:
+    retq
+
+    .section    .text.C,"ax",@progbits
+    .globl  C
+C:
+    retq
+
+    .section    .text.B,"ax",@progbits
+    .globl  B
+B:
+    retq
+
+    .section    .text.A,"ax",@progbits
+    .globl  A
+A:
+Aa:
+    retq
+
+    .cg_profile A, B, 10
+    .cg_profile A, B, 10
+    .cg_profile Aa, B, 80
+    .cg_profile A, C, 40
+    .cg_profile B, C, 30
+    .cg_profile C, D, 90
+
Index: lld/test/ELF/symbol-ordering-file-cgprofile-txt.s
===================================================================
--- /dev/null
+++ lld/test/ELF/symbol-ordering-file-cgprofile-txt.s
@@ -0,0 +1,54 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
+// RUN: ld.lld -e A %t1 -o %t2
+// RUN: llvm-nm --numeric-sort %t2 | FileCheck %s --check-prefix=NO_ORDERING
+// NO_ORDERING: 	0000000000201000 T A
+// NO_ORDERING-NEXT: 	0000000000201001 T B
+// NO_ORDERING-NEXT:	0000000000201002 T C
+// NO_ORDERING-NEXT:	0000000000201003 T D	
+
+// RUN: rm %t.call_graph || true
+// RUN: echo "A B 5" > %t.call_graph
+// RUN: echo "B C 50" >> %t.call_graph
+// RUN: echo "C D 40" >> %t.call_graph
+// RUN: echo "D B 10" >> %t.call_graph
+
+// RUN: rm %t.symbol_order || true
+// RUN: echo "D" >> %t.symbol_order
+// RUN: echo "C" >> %t.symbol_order
+// RUN: echo "B" >> %t.symbol_order
+// RUN: echo "A" >> %t.symbol_order
+
+// RUN: ld.lld -e A %t1 --symbol-ordering-file %t.symbol_order --call-graph-ordering-file %t.call_graph -o %t2
+// RUN: llvm-nm --numeric-sort %t2 | FileCheck %s --check-prefix=CALL_GRAPH_LAST
+// CALL_GRAPH_LAST:		0000000000201000 T B
+// CALL_GRAPH_LAST-NEXT:	0000000000201001 T C
+// CALL_GRAPH_LAST-NEXT:	0000000000201002 T D
+// CALL_GRAPH_LAST-NEXT:	0000000000201003 T A
+
+// RUN: ld.lld -e A %t1 --call-graph-ordering-file %t.call_graph --symbol-ordering-file %t.symbol_order -o %t2
+// RUN: llvm-nm --numeric-sort %t2 | FileCheck %s --check-prefix=SYMBOL_ORDER_LAST
+// SYMBOL_ORDER_LAST:		0000000000201000 T D
+// SYMBOL_ORDER_LAST-NEXT:	0000000000201001 T C
+// SYMBOL_ORDER_LAST-NEXT:	0000000000201002 T B
+// SYMBOL_ORDER_LAST-NEXT:	0000000000201003 T A
+
+.section    .text.A,"ax",@progbits
+.globl  A
+A:
+ nop
+
+.section    .text.B,"ax",@progbits
+.globl  B
+B:
+ nop
+
+.section    .text.C,"ax",@progbits
+.globl  C
+C:
+ nop
+
+.section    .text.D,"ax",@progbits
+.globl  D
+D:
+ nop