diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 41d111c69620..d80c54809a91 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1153,7 +1153,9 @@ static void add_return_call(struct objtool_file *file, struct instruction *insn)
 	insn->type = INSN_RETURN;
 	insn->retpoline_safe = true;
 
-	list_add_tail(&insn->call_node, &file->return_thunk_list);
+	/* Skip the non-text sections, specially .discard ones */
+	if (insn->sec->text)
+		list_add_tail(&insn->call_node, &file->return_thunk_list);
 }
 
 /*