From 265cef40f059307ab13719266dd83790fa526d29 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 28 Apr 2020 16:09:25 +0000
Subject: [PATCH] Don't try ctfconvert on file without debug info.

This was currently an ignored error but will change to a hard error
eventually.

Differential Revision:	https://reviews.freebsd.org/D24536
---
 sys/conf/Makefile.amd64 | 2 +-
 sys/conf/files.amd64    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index d34359f1d30b..6effea176878 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -18,7 +18,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600012
+%VERSREQ=	600018
 
 STD8X16FONT?=	iso
 
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index a4684ba3ac30..9efc6d1014e3 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -113,7 +113,8 @@ amd64/amd64/initcpu.c		standard
 amd64/amd64/io.c		optional	io
 amd64/amd64/locore.S		standard	no-obj
 amd64/amd64/xen-locore.S	optional	xenhvm \
-	compile-with "${NORMAL_S} -g0"
+	compile-with "${NORMAL_S} -g0" \
+	no-ctfconvert
 amd64/amd64/machdep.c		standard
 amd64/amd64/mem.c		optional	mem
 amd64/amd64/minidump_machdep.c	standard