Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/libexec/ld.elf_so Disable integrated-assembler for cla...



details:   https://anonhg.NetBSD.org/src/rev/0d252e3f778d
branches:  trunk
changeset: 325471:0d252e3f778d
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Dec 25 22:26:35 2013 +0000

description:
Disable integrated-assembler for clang on ARM for two files that are
victims of the @ comment mess on that platform. Add a reference to the
upstream PR.

diffstat:

 tests/libexec/ld.elf_so/helper_symver_dso1/Makefile |  8 +++++++-
 tests/libexec/ld.elf_so/helper_symver_dso2/Makefile |  7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r c3ce2a67dc75 -r 0d252e3f778d tests/libexec/ld.elf_so/helper_symver_dso1/Makefile
--- a/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile       Wed Dec 25 22:21:32 2013 +0000
+++ b/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile       Wed Dec 25 22:26:35 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/25 05:45:13 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2013/12/25 22:26:35 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -20,4 +20,10 @@
 
 LDFLAGS.lib${LIB} += -Wl,--version-script=${.CURDIR}/h_helper_symver_dso1.map
 
+.if !empty(MACHINE_ARCH:M*arm*)
+# LLVM PR 18273
+COPTS.h_helper_symver_dso1.c=  ${${ACTIVE_CC} == "clang":?-no-integrated-as :}
+.endif
+
 .include <bsd.lib.mk>
+
diff -r c3ce2a67dc75 -r 0d252e3f778d tests/libexec/ld.elf_so/helper_symver_dso2/Makefile
--- a/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile       Wed Dec 25 22:21:32 2013 +0000
+++ b/tests/libexec/ld.elf_so/helper_symver_dso2/Makefile       Wed Dec 25 22:26:35 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/25 05:45:13 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2013/12/25 22:26:35 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -20,4 +20,9 @@
 
 LDFLAGS.lib${LIB} += -Wl,--version-script=${.CURDIR}/h_helper_symver_dso2.map
 
+.if !empty(MACHINE_ARCH:M*arm*)
+# LLVM PR 18273
+COPTS.h_helper_symver_dso2.c=  ${${ACTIVE_CC} == "clang":?-no-integrated-as :}
+.endif
+
 .include <bsd.lib.mk>



Home | Main Index | Thread Index | Old Index