Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Jun 2012 18:09:39 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r237812 - stable/9/sys/boot/i386/cdboot
Message-ID:  <201206291809.q5TI9dk1062063@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Fri Jun 29 18:09:39 2012
New Revision: 237812
URL: http://svn.freebsd.org/changeset/base/237812

Log:
  MFC r235281:
  
  Fix sys/boot/i386/cdboot/cdboot.S compilation with clang after r235219.
  This file uses .code16 directives, which are not yet supported by
  clang's integrated assembler.

Modified:
  stable/9/sys/boot/i386/cdboot/Makefile
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/boot/   (props changed)

Modified: stable/9/sys/boot/i386/cdboot/Makefile
==============================================================================
--- stable/9/sys/boot/i386/cdboot/Makefile	Fri Jun 29 17:39:40 2012	(r237811)
+++ stable/9/sys/boot/i386/cdboot/Makefile	Fri Jun 29 18:09:39 2012	(r237812)
@@ -13,3 +13,7 @@ ORG=	0x7c00
 LDFLAGS=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary
 
 .include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS.cdboot.S=	${CLANG_NO_IAS}
+CFLAGS+=		${CFLAGS.${.IMPSRC:T}}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206291809.q5TI9dk1062063>