From cd4c9a46e2499ed56950d324b3d95c580e0ab03a Mon Sep 17 00:00:00 2001
From: Zhipeng Xie <xiezhipeng1@huawei.com>
Date: Thu, 27 Feb 2020 15:36:55 -0500
Subject: [PATCH 15/38] create-diff-object: fix .orc_unwind_ip error

error: .orc_unwind_ip section header details
differ from .orc_unwind_ip

Don't correlate .orc_unwind sections and symbols

Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
---
 kpatch-build/create-diff-object.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c
index 2d28aa0..41a9c0f 100644
--- a/kpatch-build/create-diff-object.c
+++ b/kpatch-build/create-diff-object.c
@@ -1108,6 +1108,9 @@ static void kpatch_correlate_sections(struct list_head *seclist_orig,
 					continue;
 			}
 
+			if (strstr(sec_orig->name, ".orc_unwind"))
+				continue;
+
 			kpatch_correlate_section(sec_orig, sec_patched);
 			break;
 		}
@@ -1148,6 +1151,9 @@ static void kpatch_correlate_symbols(struct list_head *symlist_orig,
 			    sym_orig->sec->twin != sym_patched->sec)
 				continue;
 
+			if (strstr(sym_orig->name, ".orc_unwind"))
+				continue;
+
 			kpatch_correlate_symbol(sym_orig, sym_patched);
 			break;
 		}
-- 
2.33.0