svn commit: r246705 - in head: lib/clang usr.bin/clang/bugpoint usr.bin/clang/clang-tblgen usr.bin/clang/llc usr.bin/clang/lli usr.bin/clang/llvm-ar usr.bin/clang/llvm-as usr.bin/clang/llvm-bcanaly...

Tue Feb 12 05:56:05 UTC 2013

Author: andrew
Date: Tue Feb 12 05:56:00 2013
New Revision: 246705
URL: http://svnweb.freebsd.org/changeset/base/246705

Log:
  Allow us to build clang for ARM EABI. Clang and llvm use the
  arm-gnueabi-freebsd10.0 triple for EABI. Use this when we are on arm or
  armv6 and are building for EABI.
  
  Reviewed by:	dim

Modified:
  head/lib/clang/clang.build.mk
  head/usr.bin/clang/bugpoint/Makefile
  head/usr.bin/clang/clang-tblgen/Makefile
  head/usr.bin/clang/llc/Makefile
  head/usr.bin/clang/lli/Makefile
  head/usr.bin/clang/llvm-ar/Makefile
  head/usr.bin/clang/llvm-as/Makefile
  head/usr.bin/clang/llvm-bcanalyzer/Makefile
  head/usr.bin/clang/llvm-diff/Makefile
  head/usr.bin/clang/llvm-dis/Makefile
  head/usr.bin/clang/llvm-extract/Makefile
  head/usr.bin/clang/llvm-link/Makefile
  head/usr.bin/clang/llvm-mc/Makefile
  head/usr.bin/clang/llvm-nm/Makefile
  head/usr.bin/clang/llvm-objdump/Makefile
  head/usr.bin/clang/llvm-prof/Makefile
  head/usr.bin/clang/llvm-ranlib/Makefile
  head/usr.bin/clang/llvm-rtdyld/Makefile
  head/usr.bin/clang/macho-dump/Makefile
  head/usr.bin/clang/opt/Makefile
  head/usr.bin/clang/tblgen/Makefile

Modified: head/lib/clang/clang.build.mk
==============================================================================

--- head/lib/clang/clang.build.mk	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/lib/clang/clang.build.mk	Tue Feb 12 05:56:00 2013	(r246705)
@@ -19,7 +19,15 @@ CFLAGS+=	-fno-strict-aliasing
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 BUILD_ARCH?=	${MACHINE_ARCH}
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0
+
+.if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
+    ${MK_ARM_EABI} != "no"
+TARGET_ABI=	gnueabi
+.else
+TARGET_ABI=	unknown
+.endif
+
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
 BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0
 CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
 		-DLLVM_HOSTTRIPLE=\"${BUILD_TRIPLE}\" \

Modified: head/usr.bin/clang/bugpoint/Makefile
==============================================================================
--- head/usr.bin/clang/bugpoint/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/bugpoint/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=bugpoint
 
 SRCDIR=	tools/bugpoint

Modified: head/usr.bin/clang/clang-tblgen/Makefile
==============================================================================
--- head/usr.bin/clang/clang-tblgen/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/clang-tblgen/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
-PROG_CXX=clang-tblgen
 NO_MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=clang-tblgen
 
 SRCDIR=	tools/clang/utils/TableGen
 SRCS=	ClangASTNodesEmitter.cpp \

Modified: head/usr.bin/clang/llc/Makefile
==============================================================================
--- head/usr.bin/clang/llc/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llc/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llc
 
 SRCDIR=	tools/llc

Modified: head/usr.bin/clang/lli/Makefile
==============================================================================
--- head/usr.bin/clang/lli/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/lli/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=lli
 
 SRCDIR=	tools/lli

Modified: head/usr.bin/clang/llvm-ar/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-ar/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-ar/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llvm-ar
 
 SRCDIR=	tools/llvm-ar

Modified: head/usr.bin/clang/llvm-as/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-as/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-as/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llvm-as
 
 SRCDIR=	tools/llvm-as

Modified: head/usr.bin/clang/llvm-bcanalyzer/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-bcanalyzer/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-bcanalyzer/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llvm-bcanalyzer
 
 SRCDIR=	tools/llvm-bcanalyzer

Modified: head/usr.bin/clang/llvm-diff/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-diff/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-diff/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llvm-diff
 
 SRCDIR=	tools/llvm-diff

Modified: head/usr.bin/clang/llvm-dis/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-dis/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-dis/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llvm-dis
 
 SRCDIR=	tools/llvm-dis

Modified: head/usr.bin/clang/llvm-extract/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-extract/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-extract/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llvm-extract
 
 SRCDIR=	tools/llvm-extract

Modified: head/usr.bin/clang/llvm-link/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-link/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-link/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llvm-link
 
 SRCDIR=	tools/llvm-link

Modified: head/usr.bin/clang/llvm-mc/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-mc/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-mc/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
-PROG_CXX=llvm-mc
 NO_MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-mc
 
 SRCDIR=	tools/llvm-mc
 SRCS=	llvm-mc.cpp \

Modified: head/usr.bin/clang/llvm-nm/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-nm/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-nm/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llvm-nm
 
 SRCDIR=	tools/llvm-nm

Modified: head/usr.bin/clang/llvm-objdump/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-objdump/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-objdump/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
-PROG_CXX=llvm-objdump
 NO_MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-objdump
 
 SRCDIR=	tools/llvm-objdump
 SRCS=	llvm-objdump.cpp \

Modified: head/usr.bin/clang/llvm-prof/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-prof/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-prof/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llvm-prof
 
 SRCDIR=	tools/llvm-prof

Modified: head/usr.bin/clang/llvm-ranlib/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-ranlib/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-ranlib/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=llvm-ranlib
 
 SRCDIR=	tools/llvm-ranlib

Modified: head/usr.bin/clang/llvm-rtdyld/Makefile
==============================================================================
--- head/usr.bin/clang/llvm-rtdyld/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/llvm-rtdyld/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
-PROG_CXX=llvm-rtdyld
 NO_MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-rtdyld
 
 SRCDIR=	tools/llvm-rtdyld
 SRCS=	llvm-rtdyld.cpp

Modified: head/usr.bin/clang/macho-dump/Makefile
==============================================================================
--- head/usr.bin/clang/macho-dump/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/macho-dump/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
-PROG_CXX=macho-dump
 NO_MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=macho-dump
 
 SRCDIR=	tools/macho-dump
 SRCS=	macho-dump.cpp

Modified: head/usr.bin/clang/opt/Makefile
==============================================================================
--- head/usr.bin/clang/opt/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/opt/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=opt
 
 SRCDIR=	tools/opt

Modified: head/usr.bin/clang/tblgen/Makefile
==============================================================================
--- head/usr.bin/clang/tblgen/Makefile	Tue Feb 12 04:22:00 2013	(r246704)
+++ head/usr.bin/clang/tblgen/Makefile	Tue Feb 12 05:56:00 2013	(r246705)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG_CXX=tblgen
 
 SRCDIR=	utils/TableGen
