From owner-svn-soc-all@freebsd.org  Wed Aug  1 19:54:14 2018
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2BC4910679EF
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Wed,  1 Aug 2018 19:54:14 +0000 (UTC)
 (envelope-from sduo@FreeBSD.org)
Received: from mxrelay.ysv.freebsd.org (mxrelay.ysv.freebsd.org
 [IPv6:2001:1900:2254:206a::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.ysv.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id C631F84E5F
 for <svn-soc-all@FreeBSD.org>; Wed,  1 Aug 2018 19:54:13 +0000 (UTC)
 (envelope-from sduo@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.ysv.freebsd.org (Postfix) with ESMTPS id 1FE601F28E
 for <svn-soc-all@FreeBSD.org>; Wed,  1 Aug 2018 19:54:13 +0000 (UTC)
 (envelope-from sduo@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id w71JsCb3008708
 for <svn-soc-all@FreeBSD.org>; Wed, 1 Aug 2018 19:54:12 GMT
 (envelope-from sduo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id w71JsCLV008656
 for svn-soc-all@FreeBSD.org; Wed, 1 Aug 2018 19:54:12 GMT
 (envelope-from sduo@FreeBSD.org)
Date: Wed, 1 Aug 2018 19:54:12 GMT
Message-Id: <201808011954.w71JsCLV008656@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 sduo@FreeBSD.org using -f
From: sduo@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r337271 - soc2018/sduo/head/sys/conf
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2018 19:54:14 -0000

Author: sduo
Date: Wed Aug  1 19:54:10 2018
New Revision: 337271
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=337271

Log:
  fixed compilation issue

Modified:
  soc2018/sduo/head/sys/conf/kern.pre.mk

Modified: soc2018/sduo/head/sys/conf/kern.pre.mk
==============================================================================
--- soc2018/sduo/head/sys/conf/kern.pre.mk	Tue Jul 24 17:33:28 2018	(r337270)
+++ soc2018/sduo/head/sys/conf/kern.pre.mk	Wed Aug  1 19:54:10 2018	(r337271)
@@ -77,7 +77,7 @@
 .endif
 NOSTDINC= -nostdinc
 
-INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S -I$S/contrib/ck/include
+INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
 
 CFLAGS=	${COPTFLAGS} ${DEBUG}
 CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
@@ -121,9 +121,6 @@
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
-.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == ""
-.error amd64 kernel requires linker ifunc support
-.endif
 LDFLAGS+=	-Wl,-z max-page-size=2097152 -Wl,-z common-page-size=4096
 .endif