Module Name: src
Committed By: joerg
Date: Fri May 20 15:05:02 UTC 2011
Modified Files:
src/sys/arch/i386/stand/mbr: Makefile.mbr
Log Message:
mbr.S and gpt.S want to reassign ., so don't use the integrated
assembler for now.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/stand/mbr/Makefile.mbr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/mbr/Makefile.mbr
diff -u src/sys/arch/i386/stand/mbr/Makefile.mbr:1.17 src/sys/arch/i386/stand/mbr/Makefile.mbr:1.18
--- src/sys/arch/i386/stand/mbr/Makefile.mbr:1.17 Fri Nov 20 17:28:19 2009
+++ src/sys/arch/i386/stand/mbr/Makefile.mbr Fri May 20 15:05:02 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mbr,v 1.17 2009/11/20 17:28:19 dsl Exp $
+# $NetBSD: Makefile.mbr,v 1.18 2011/05/20 15:05:02 joerg Exp $
S= ${.CURDIR}/../../../../..
@@ -41,6 +41,9 @@
LOADADDR= 0x8800
+AFLAGS.mbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.gpt.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
${PROG}: ${OBJS}
${_MKTARGET_LINK}
${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${LOADADDR} ${OBJS}
