Index: lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
+++ lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/Makefile
@@ -0,0 +1,12 @@
+LEVEL = ../../make
+CXX_SOURCES := main.cpp
+LD_EXTRAS += -Wl,--build-id=none
+
+localall : stripped.out all
+stripped.out : a.out
+				       $(OBJCOPY) --remove-section=.note.gnu.build-id --remove-section=.gnu_debuglink --strip-debug a.out stripped.out
+
+clean::
+				$(RM) stripped.out
+
+include $(LEVEL)/Makefile.rules
\ No newline at end of file
Index: lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/TestTargetSymbolsAddCommand.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/TestTargetSymbolsAddCommand.py
+++ lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/TestTargetSymbolsAddCommand.py
@@ -0,0 +1,52 @@
+""" Testing explicit symbol loading via target symbols add. """
+import os
+import time
+import lldb
+import sys
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+class TargetSymbolsAddCommand(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    def setUp(self):
+        TestBase.setUp(self)
+        self.source = 'main.c'
+
+    @no_debug_info_test  # Prevent the genaration of the dwarf version of this test
+    @skipUnlessPlatform(['linux'])
+    def test_target_symbols_add(self):
+        """Test that 'target symbols add' can load the symbols
+        even if gnu.build-id and gnu_debuglink are not present in the module.
+        Similar to test_add_dsym_mid_execution test for macos."""
+        self.build(clean=True)
+        exe = os.path.join(os.getcwd(), "stripped.out")
+
+        self.target = self.dbg.CreateTarget(exe)
+        self.assertTrue(self.target, VALID_TARGET)
+
+        main_bp = self.target.BreakpointCreateByName("main", "stripped.out")
+        self.assertTrue(main_bp, VALID_BREAKPOINT)
+
+        self.process = self.target.LaunchSimple(
+            None, None, self.get_process_working_directory())
+        self.assertTrue(self.process, PROCESS_IS_VALID)
+
+        # The stop reason of the thread should be breakpoint.
+        self.assertTrue(self.process.GetState() == lldb.eStateStopped,
+                        STOPPED_DUE_TO_BREAKPOINT)
+
+        exe_module = self.target.GetModuleAtIndex(0)
+
+        # Check that symbols are not loaded and main.c is not know to be
+        # the source file.
+        self.expect("frame select", substrs=['main.c'], matching=False)
+
+        # Tell LLDB that a.out has symbols for stripped.out
+        self.runCmd("target symbols add -s stripped.out a.out")
+
+        # Check that symbols are now loaded and main.c is in the output.
+        self.expect("frame select", substrs=['main.c'])
Index: lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/main.c
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/main.c
+++ lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/main.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+static int var = 5;
+int main() {
+  printf("%p is %d\n", &var, var);
+  return ++var;
+}
Index: lldb/trunk/source/Commands/CommandObjectTarget.cpp
===================================================================
--- lldb/trunk/source/Commands/CommandObjectTarget.cpp
+++ lldb/trunk/source/Commands/CommandObjectTarget.cpp
@@ -3969,7 +3969,8 @@
             "Add a debug symbol file to one of the target's current modules by "
             "specifying a path to a debug symbols file, or using the options "
             "to specify a module to download symbols for.",
-            "target symbols add [<symfile>]", eCommandRequiresTarget),
+            "target symbols add <cmd-options> [<symfile>]",
+            eCommandRequiresTarget),
         m_option_group(),
         m_file_option(
             LLDB_OPT_SET_1, false, "shlib", 's',
@@ -4289,18 +4290,22 @@
       if (uuid_option_set) {
         result.AppendError("specify either one or more paths to symbol files "
                            "or use the --uuid option without arguments");
-      } else if (file_option_set) {
-        result.AppendError("specify either one or more paths to symbol files "
-                           "or use the --file option without arguments");
       } else if (frame_option_set) {
         result.AppendError("specify either one or more paths to symbol files "
                            "or use the --frame option without arguments");
+      } else if (file_option_set && argc > 1) {
+        result.AppendError("specify at most one symbol file path when "
+                           "--shlib option is set");
       } else {
         PlatformSP platform_sp(target->GetPlatform());
 
         for (auto &entry : args.entries()) {
           if (!entry.ref.empty()) {
             module_spec.GetSymbolFileSpec().SetFile(entry.ref, true);
+            if (file_option_set) {
+              module_spec.GetFileSpec() =
+                  m_file_option.GetOptionValue().GetCurrentValue();
+            }
             if (platform_sp) {
               FileSpec symfile_spec;
               if (platform_sp
Index: lldb/trunk/source/Interpreter/CommandObject.cpp
===================================================================
--- lldb/trunk/source/Interpreter/CommandObject.cpp
+++ lldb/trunk/source/Interpreter/CommandObject.cpp
@@ -57,7 +57,7 @@
 llvm::StringRef CommandObject::GetHelpLong() { return m_cmd_help_long; }
 
 llvm::StringRef CommandObject::GetSyntax() {
-  if (m_cmd_syntax.empty())
+  if (!m_cmd_syntax.empty())
     return m_cmd_syntax;
 
   StreamString syntax_str;