2 files changed, 7 insertions, 23 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/builders/builder.py b/lldb/packages/Python/lldbsuite/test/builders/builder.py
index efb1ba5..de05732 100644
--- a/lldb/packages/Python/lldbsuite/test/builders/builder.py
+++ b/lldb/packages/Python/lldbsuite/test/builders/builder.py
@@ -247,25 +247,13 @@ class Builder:
     def _getDebugInfoArgs(self, debug_info):
         if debug_info is None:
             return []
-        
-        debug_options = debug_info if isinstance(debug_info, list) else [debug_info]
-        option_flags = {
-            "dwarf": {"MAKE_DSYM": "NO"},
-            "dwo": {"MAKE_DSYM": "NO", "MAKE_DWO": "YES"},
-            "gmodules": {"MAKE_DSYM": "NO", "MAKE_GMODULES": "YES"},
-            "debug_names": {"MAKE_DEBUG_NAMES": "YES"},
-            "dwp": {"MAKE_DSYM": "NO", "MAKE_DWP": "YES"},
-        }
-        
-        # Collect all flags, with later options overriding earlier ones
-        flags = {}
-        
-        for option in debug_options:
-            if not option or option not in option_flags:
-                return None # Invalid options
-            flags.update(option_flags[option])
-        
-        return [f"{key}={value}" for key, value in flags.items()]
+        if debug_info == "dwarf":
+            return ["MAKE_DSYM=NO"]
+        if debug_info == "dwo":
+            return ["MAKE_DSYM=NO", "MAKE_DWO=YES"]
+        if debug_info == "gmodules":
+            return ["MAKE_DSYM=NO", "MAKE_GMODULES=YES"]
+        return None
 
     def getBuildCommand(
         self,
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index 58833e1..06959f2 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -276,10 +276,6 @@ ifeq "$(MAKE_DWO)" "YES"
 	CFLAGS += -gsplit-dwarf
 endif
 
-ifeq "$(MAKE_DEBUG_NAMES)" "YES"
-	CFLAGS += -gpubnames
-endif
-
 ifeq "$(USE_PRIVATE_MODULE_CACHE)" "YES"
 THE_CLANG_MODULE_CACHE_DIR := $(BUILDDIR)/private-module-cache
 else