summaryrefslogtreecommitdiffstats
path: root/lib/clang
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2014-11-19 01:07:58 +0000
committersjg <sjg@FreeBSD.org>2014-11-19 01:07:58 +0000
commitb137080f19736ee33fede2e88bb54438604cf86b (patch)
tree377ac0ac449528621eb192cd245adadb5fd53668 /lib/clang
parentab21a29eb607d4dfe389b965fbdee27558e791aa (diff)
parent4a8d07956d121238d006d34ffe7d6269744e8b1a (diff)
downloadFreeBSD-src-b137080f19736ee33fede2e88bb54438604cf86b.zip
FreeBSD-src-b137080f19736ee33fede2e88bb54438604cf86b.tar.gz
Merge from head@274682
Diffstat (limited to 'lib/clang')
-rw-r--r--lib/clang/clang.build.mk9
-rw-r--r--lib/clang/include/clang/Config/config.h2
-rw-r--r--lib/clang/include/llvm/Config/config.h2
3 files changed, 6 insertions, 7 deletions
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index ec8f451..0f68178 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -22,11 +22,10 @@ CFLAGS+= -fno-strict-aliasing
TARGET_ARCH?= ${MACHINE_ARCH}
BUILD_ARCH?= ${MACHINE_ARCH}
-.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
- ${MK_ARM_EABI} != "no"
-TARGET_ABI= gnueabi
-.elif ${TARGET_ARCH} == "armv6hf"
+.if ${TARGET_ARCH:Marm*hf*} != ""
TARGET_ABI= gnueabihf
+.elif ${TARGET_ARCH:Marm*} != ""
+TARGET_ABI= gnueabi
.else
TARGET_ABI= unknown
.endif
@@ -250,7 +249,7 @@ Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
.endfor
SRCS+= ${TGHDRS:C/$/.inc.h/}
-DPADD+= ${TGHDRS:C/$/.inc.h/}
+DPSRCS+= ${TGHDRS:C/$/.inc.h/}
CLEANFILES+= ${TGHDRS:C/$/.inc.h/} ${TGHDRS:C/$/.inc.d/}
# if we are not doing explicit 'make depend', there is
diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h
index 8a7936b..5c35829 100644
--- a/lib/clang/include/clang/Config/config.h
+++ b/lib/clang/include/clang/Config/config.h
@@ -6,7 +6,7 @@
#define CONFIG_H
/* Bug report URL. */
-#define BUG_REPORT_URL "http://llvm.org/bugs/"
+#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/"
/* Relative directory for resource files */
#define CLANG_RESOURCE_DIR ""
diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h
index cbbb4fb..ce32c50 100644
--- a/lib/clang/include/llvm/Config/config.h
+++ b/lib/clang/include/llvm/Config/config.h
@@ -9,7 +9,7 @@
#include <osreldate.h>
/* Bug report URL. */
-#define BUG_REPORT_URL "http://llvm.org/bugs/"
+#define BUG_REPORT_URL "https://bugs.freebsd.org/submit/"
/* Define if we have libxml2 */
/* #undef CLANG_HAVE_LIBXML */
OpenPOWER on IntegriCloud