Module Name: src
Committed By: joerg
Date: Tue Sep 27 19:18:42 UTC 2016
Modified Files:
src/external/mit/xorg/lib/fontconfig/src: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libxshmfence: Makefile
Log Message:
Allow clang to generate SPARCv8+ assembly for now.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/lib/fontconfig/src/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libxshmfence/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/fontconfig/src/Makefile
diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.18 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.19
--- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.18 Tue May 31 02:35:49 2016
+++ src/external/mit/xorg/lib/fontconfig/src/Makefile Tue Sep 27 19:18:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/05/31 02:35:49 pgoyette Exp $
+# $NetBSD: Makefile,v 1.19 2016/09/27 19:18:42 joerg Exp $
.include <bsd.own.mk>
@@ -135,5 +135,14 @@ CPPFLAGS.fcxml.c= -Wno-error
CWARNFLAGS.clang+= -Wno-pointer-sign -Wno-switch
+.if ${MACHINE_ARCH} == "sparc" || ${COMMON_MACHINE_ARCH:U} == "sparc"
+COPTS.fccache.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
+COPTS.fccfg.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
+COPTS.fccharset.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
+COPTS.fcobjs.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
+COPTS.fcpat.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
+COPTS.fcstr.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
+.endif
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.15 src/external/mit/xorg/lib/gallium/Makefile:1.16
--- src/external/mit/xorg/lib/gallium/Makefile:1.15 Tue Aug 16 21:05:14 2016
+++ src/external/mit/xorg/lib/gallium/Makefile Tue Sep 27 19:18:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/08/16 21:05:14 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2016/09/27 19:18:42 joerg Exp $
# Link the gallium mega driver.
@@ -632,6 +632,10 @@ SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}
.endif
.endfor
+.if ${MACHINE_ARCH} == "sparc" || ${COMMON_MACHINE_ARCH:U} == "sparc"
+COPTS+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
+.endif
+
.include <bsd.lib.mk>
# Don't regenerate c files
.y.c:
Index: src/external/mit/xorg/lib/libxshmfence/Makefile
diff -u src/external/mit/xorg/lib/libxshmfence/Makefile:1.4 src/external/mit/xorg/lib/libxshmfence/Makefile:1.5
--- src/external/mit/xorg/lib/libxshmfence/Makefile:1.4 Wed Aug 31 14:29:13 2016
+++ src/external/mit/xorg/lib/libxshmfence/Makefile Tue Sep 27 19:18:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/08/31 14:29:13 christos Exp $
+# $NetBSD: Makefile,v 1.5 2016/09/27 19:18:42 joerg Exp $
.include <bsd.own.mk>
@@ -25,5 +25,9 @@ PKGDIST= ${LIB}
COPTS.xshmfence_semaphore.c += -Wno-stack-protector
+.if ${MACHINE_ARCH} == "sparc" || ${COMMON_MACHINE_ARCH:U} == "sparc"
+COPTS.xshmfence_semaphore.c+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :}
+.endif
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
