Author: imp
Date: Thu Jul 10 00:15:38 2014
New Revision: 268474
URL: http://svnweb.freebsd.org/changeset/base/268474

Log:
  Merge the clang support from i386. Don't move to clang yet.

Modified:
  head/sys/boot/pc98/boot2/Makefile

Modified: head/sys/boot/pc98/boot2/Makefile
==============================================================================
--- head/sys/boot/pc98/boot2/Makefile   Wed Jul  9 23:14:59 2014        
(r268473)
+++ head/sys/boot/pc98/boot2/Makefile   Thu Jul 10 00:15:38 2014        
(r268474)
@@ -26,10 +26,7 @@ BOOT2_UFS?=  UFS1_AND_UFS2
 #BOOT2_UFS?=   UFS1_ONLY
 
 CFLAGS=        -Os \
-       -fno-guess-branch-probability \
        -fomit-frame-pointer \
-       -fno-unit-at-a-time \
-       -mno-align-long-strings \
        -mrtd \
        -mregparm=3 \
        -D${BOOT2_UFS} \
@@ -46,7 +43,10 @@ CFLAGS=      -Os \
        -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
        -Winline
 
-CFLAGS.gcc+=   --param max-inline-insns-single=100
+CFLAGS.gcc+=   -fno-guess-branch-probability \
+               -fno-unit-at-a-time \
+               -mno-align-long-strings \
+               --param max-inline-insns-single=100
 
 # Set machine type to PC98_SYSTEM_PARAMETER
 #CFLAGS+=      -DSET_MACHINE_TYPE
@@ -54,6 +54,8 @@ CFLAGS.gcc+=  --param max-inline-insns-si
 # Initialize the bi_bios_geom using the BIOS geometry
 #CFLAGS+=      -DGET_BIOSGEOM
 
+CFLAGS.clang+=${CLANG_OPT_SMALL}
+
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
@@ -112,3 +114,6 @@ boot2.h: boot1.out
            REL1=`printf "%d" ${REL1}` > ${.TARGET}
 
 .include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+=               ${CLANG_NO_IAS}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to