From owner-svn-src-projects@FreeBSD.ORG  Tue Oct 20 10:38:12 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B549C1065676;
	Tue, 20 Oct 2009 10:38:12 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B9138FC16;
	Tue, 20 Oct 2009 10:38:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9KAcC6t064636;
	Tue, 20 Oct 2009 10:38:12 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9KAcCZn064631;
	Tue, 20 Oct 2009 10:38:12 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200910201038.n9KAcCZn064631@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 20 Oct 2009 10:38:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198274 - in projects/clangbsd/sys/boot/i386: boot2
	gptboot loader
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Oct 2009 10:38:12 -0000

Author: rdivacky
Date: Tue Oct 20 10:38:12 2009
New Revision: 198274
URL: http://svn.freebsd.org/changeset/base/198274

Log:
  Set CC=gcc unconditionally for boot2/loader/gptboot.
  Unstaticize memcy in gptboot.

Modified:
  projects/clangbsd/sys/boot/i386/boot2/Makefile
  projects/clangbsd/sys/boot/i386/gptboot/Makefile
  projects/clangbsd/sys/boot/i386/gptboot/gptboot.c
  projects/clangbsd/sys/boot/i386/loader/Makefile

Modified: projects/clangbsd/sys/boot/i386/boot2/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/boot2/Makefile	Tue Oct 20 10:15:19 2009	(r198273)
+++ projects/clangbsd/sys/boot/i386/boot2/Makefile	Tue Oct 20 10:38:12 2009	(r198274)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc"
 CC=		gcc
-.endif
 
 FILES=		boot boot1 boot2
 

Modified: projects/clangbsd/sys/boot/i386/gptboot/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/gptboot/Makefile	Tue Oct 20 10:15:19 2009	(r198273)
+++ projects/clangbsd/sys/boot/i386/gptboot/Makefile	Tue Oct 20 10:38:12 2009	(r198274)
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc"
-CC=		gcc
-.endif
-
 .PATH:		${.CURDIR}/../boot2
 
 FILES=		gptboot

Modified: projects/clangbsd/sys/boot/i386/gptboot/gptboot.c
==============================================================================
--- projects/clangbsd/sys/boot/i386/gptboot/gptboot.c	Tue Oct 20 10:15:19 2009	(r198273)
+++ projects/clangbsd/sys/boot/i386/gptboot/gptboot.c	Tue Oct 20 10:38:12 2009	(r198274)
@@ -143,7 +143,7 @@ static int xfsread(ino_t, void *, size_t
 static int dskread(void *, daddr_t, unsigned);
 static void printf(const char *,...);
 static void putchar(int);
-static void memcpy(void *, const void *, int);
+void memcpy(void *, const void *, int);
 static uint32_t memsize(void);
 static int drvread(void *, daddr_t, unsigned);
 static int keyhit(unsigned);
@@ -151,7 +151,7 @@ static int xputc(int);
 static int xgetc(int);
 static int getc(int);
 
-static void
+void
 memcpy(void *dst, const void *src, int len)
 {
     const char *s = src;

Modified: projects/clangbsd/sys/boot/i386/loader/Makefile
==============================================================================
--- projects/clangbsd/sys/boot/i386/loader/Makefile	Tue Oct 20 10:15:19 2009	(r198273)
+++ projects/clangbsd/sys/boot/i386/loader/Makefile	Tue Oct 20 10:38:12 2009	(r198274)
@@ -4,9 +4,7 @@
 MK_SSP=		no
 
 # XXX: broken compiler include paths
-.if ${MK_CLANG_IS_CC} != "no" && ${CC} == "cc"
 CC=		gcc
-.endif
 
 PROG=		loader.sym
 INTERNALPROG=