From 55be10486ef6aad1f497fb0ab85ac36043b79652 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 9 Jan 2023 15:12:10 -0700
Subject: [PATCH] fix merge conflict with identifiers matching primitives

---
 src/clang_options_data.zig | 2 +-
 src/main.zig               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/clang_options_data.zig b/src/clang_options_data.zig
index 6db3489a47..e7f7d85af8 100644
--- a/src/clang_options_data.zig
+++ b/src/clang_options_data.zig
@@ -6336,7 +6336,7 @@ joinpd1("sycl-std="),
 .{
     .name = "undefined",
     .syntax = .joined_or_separate,
-    .zig_equivalent = .undefined,
+    .zig_equivalent = .@"undefined",
     .pd1 = true,
     .pd2 = false,
     .psl = false,
diff --git a/src/main.zig b/src/main.zig
index d442284219..b752c89308 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1661,7 +1661,7 @@ fn buildOutputType(
                     .install_name => {
                         install_name = it.only_arg;
                     },
-                    .undefined => {
+                    .@"undefined" => {
                         if (mem.eql(u8, "dynamic_lookup", it.only_arg)) {
                             linker_allow_shlib_undefined = true;
                         } else {
@@ -4730,7 +4730,7 @@ pub const ClangArgIterator = struct {
         headerpad_max_install_names,
         compress_debug_sections,
         install_name,
-        undefined,
+        @"undefined",
     };
 
     const Args = struct {