From owner-svn-src-head@freebsd.org  Fri Oct 21 04:49:40 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66843C1AED6;
 Fri, 21 Oct 2016 04:49:40 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2CC7E21E;
 Fri, 21 Oct 2016 04:49:40 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9L4ndbW071298;
 Fri, 21 Oct 2016 04:49:39 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9L4ndCA071297;
 Fri, 21 Oct 2016 04:49:39 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201610210449.u9L4ndCA071297@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Fri, 21 Oct 2016 04:49:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r307699 - head/gnu/lib/libgcc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Oct 2016 04:49:40 -0000

Author: ngie
Date: Fri Oct 21 04:49:39 2016
New Revision: 307699
URL: https://svnweb.freebsd.org/changeset/base/307699

Log:
  Revert r307689
  
  The proposed change ("Fix building of llvm's unwind if gcc has been
  also built") breaks the build with clang/llvm.
  
  Tested with...
  
  	(
  	export SRCCONF=/dev/null WITH_CLANG=
  	cd gnu/lib/libgcc; make obj; make depend; make all
  	)
  
  MFC after:	3 days
  X-MFC with:	r307689
  Pointyhat to:	bapt
  Reported by:	Jenkins, O. Hartmann <ohartman@zedat.fu-berlin.de>
  Sponsored by:	Dell EMC Isilon

Modified:
  head/gnu/lib/libgcc/Makefile

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Fri Oct 21 03:23:17 2016	(r307698)
+++ head/gnu/lib/libgcc/Makefile	Fri Oct 21 04:49:39 2016	(r307699)
@@ -30,7 +30,8 @@ CFLAGS+=	-DTARGET_ARM_EABI
 CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
 		-DHAVE_GTHR_DEFAULT \
 		-I${GCCLIB}/include \
-		-I${GCCDIR}/config -I${GCCDIR} -I.
+		-I${GCCDIR}/config -I${GCCDIR} -I. \
+		-I${CCDIR}/cc_tools
 
 LDFLAGS+=	-nodefaultlibs
 LIBADD+=	c
@@ -101,12 +102,6 @@ CFLAGS+=	-I${SRCTOP}/contrib/libc++/incl
 
 .else # MK_LLVM_LIBUNWIND
 
-#
-# Prevent the potential unwind.h from gcc (generated)
-# to be in the include path before the one from llvm unwind
-#
-CFLAGS+=	-I${CCDIR}/cc_tools
-
 .if ${TARGET_CPUARCH} == "arm"
 LIB2ADDEH =	unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c
 .else