From 63b33c71b1ad3bbe0aa94402e1911c6014de5748 Mon Sep 17 00:00:00 2001
From: Dwight Guth <dwight.guth@runtimeverification.com>
Date: Fri, 24 Apr 2020 16:32:44 +0000
Subject: [PATCH] fix kcc script merge conflict

---
 scripts/kcc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/kcc b/scripts/kcc
index 2c7cac6ee..f37d54d42 100755
--- a/scripts/kcc
+++ b/scripts/kcc
@@ -358,16 +358,16 @@ sub makeOptions {
       if (arg('-funresolved-symbols=')) {
             my $string_arg = arg('-funresolved-symbols=');
             if ($string_arg eq 'ignore-all') {
-                  push(@options, "`UnresolvedSymbols`(`IgnoreAll`(.KList))");
+                  push(@options, "LblUnresolvedSymbols{}(LblIgnoreAll{}())");
             } elsif ($string_arg eq 'warn-all') {
-                  push(@options, "`UnresolvedSymbols`(`WarnAll`(.KList))");
+                  push(@options, "LblUnresolvedSymbols{}(LblWarnAll{}())");
             } elsif ($string_arg eq 'report-all') {
-                  push(@options, "`UnresolvedSymbols`(`ReportAll`(.KList))");
+                  push(@options, "LblUnresolvedSymbols{}(LblReportAll{}())");
             } elsif ($string_arg eq 'warn-unreachable') {
-                  push(@options, "`UnresolvedSymbols`(`WarnUnreachable`(.KList))");
+                  push(@options, "LblUnresolvedSymbols{}(LblWarnUnreachable{}())");
             }
       } else {
-            push(@options, "`UnresolvedSymbols`(`WarnUnreachable`(.KList))");
+            push(@options, "LblUnresolvedSymbols{}(LblWarnUnreachable{}())");
       }
 
       for (breakpoints()) {