svn commit: r198274 - in projects/clangbsd/sys/boot/i386: boot2 gptboot loader

[Roman Divacky]

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=