svn commit: r210288 - in projects/clangbsd/lib/clang: . include/clang/Basic include/llvm/Config

Ed Schouten ed at FreeBSD.org
Tue Jul 20 10:00:36 UTC 2010


Author: ed
Date: Tue Jul 20 10:00:35 2010
New Revision: 210288
URL: http://svn.freebsd.org/changeset/base/210288

Log:
  Small cleanups to the Clang build infrastructure:
  
  - Move all version related definitions into Version.inc, instead of
    having them scattered throughout clang.build.mk and Version.inc.
  
  - Tidify the asmprinters/targets/asmparsers/disassemblers target lists.
    We maintain these files ourselves, instead of using the files
    generated by autoconf.

Modified:
  projects/clangbsd/lib/clang/clang.build.mk
  projects/clangbsd/lib/clang/include/clang/Basic/Version.inc
  projects/clangbsd/lib/clang/include/llvm/Config/AsmParsers.def
  projects/clangbsd/lib/clang/include/llvm/Config/AsmPrinters.def
  projects/clangbsd/lib/clang/include/llvm/Config/Disassemblers.def
  projects/clangbsd/lib/clang/include/llvm/Config/Targets.def

Modified: projects/clangbsd/lib/clang/clang.build.mk
==============================================================================
--- projects/clangbsd/lib/clang/clang.build.mk	Tue Jul 20 07:27:36 2010	(r210287)
+++ projects/clangbsd/lib/clang/clang.build.mk	Tue Jul 20 10:00:35 2010	(r210288)
@@ -27,9 +27,7 @@ CFLAGS+= -O1
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 # XXX: 8.0, to keep __FreeBSD_cc_version happy
-CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH}-undermydesk-freebsd9.0\" \
-	-DCLANG_VENDOR=\"FreeBSD\ \" -DSVN_REVISION=\"108428\" \
-	-DCLANG_VENDOR_SUFFIX=\"\ 20100715\"
+CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH}-undermydesk-freebsd9.0\"
 
 .PATH:	${LLVM_SRCS}/${SRCDIR}
 

Modified: projects/clangbsd/lib/clang/include/clang/Basic/Version.inc
==============================================================================
--- projects/clangbsd/lib/clang/include/clang/Basic/Version.inc	Tue Jul 20 07:27:36 2010	(r210287)
+++ projects/clangbsd/lib/clang/include/clang/Basic/Version.inc	Tue Jul 20 10:00:35 2010	(r210288)
@@ -1,7 +1,10 @@
 /* $FreeBSD$ */
-#define CLANG_VERSION 2.8
-#define CLANG_VERSION_MAJOR 2
-#define CLANG_VERSION_MINOR 8
-#if 0
-#define CLANG_VERSION_PATCHLEVEL 
-#endif
+
+#define	CLANG_VERSION		2.8
+#define	CLANG_VERSION_MAJOR	2
+#define	CLANG_VERSION_MINOR	8
+
+#define	CLANG_VENDOR		"FreeBSD "
+#define	CLANG_VENDOR_SUFFIX	" 20100715"
+
+#define	SVN_REVISION		"108428"

Modified: projects/clangbsd/lib/clang/include/llvm/Config/AsmParsers.def
==============================================================================
--- projects/clangbsd/lib/clang/include/llvm/Config/AsmParsers.def	Tue Jul 20 07:27:36 2010	(r210287)
+++ projects/clangbsd/lib/clang/include/llvm/Config/AsmParsers.def	Tue Jul 20 10:00:35 2010	(r210288)
@@ -1,30 +1,6 @@
 /* $FreeBSD$ */
-//===- llvm/Config/AsmParsers.def - LLVM Assembly Parsers -------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file enumerates all of the assembly-language parsers
-// supported by this build of LLVM. Clients of this file should define
-// the LLVM_ASM_PARSER macro to be a function-like macro with a
-// single parameter (the name of the target whose assembly can be
-// generated); including this file will then enumerate all of the
-// targets with assembly parsers.
-//
-// The set of targets supported by LLVM is generated at configuration
-// time, at which point this header is generated. Do not modify this
-// header directly.
-//
-//===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ASM_PARSER
-#  error Please define the macro LLVM_ASM_PARSER(TargetName)
-#endif
-
-LLVM_ASM_PARSER(ARM) LLVM_ASM_PARSER(X86) 
+LLVM_ASM_PARSER(ARM)
+LLVM_ASM_PARSER(X86)
 
 #undef LLVM_ASM_PARSER

Modified: projects/clangbsd/lib/clang/include/llvm/Config/AsmPrinters.def
==============================================================================
--- projects/clangbsd/lib/clang/include/llvm/Config/AsmPrinters.def	Tue Jul 20 07:27:36 2010	(r210287)
+++ projects/clangbsd/lib/clang/include/llvm/Config/AsmPrinters.def	Tue Jul 20 10:00:35 2010	(r210288)
@@ -1,30 +1,8 @@
 /* $FreeBSD$ */
-//===- llvm/Config/AsmPrinters.def - LLVM Assembly Printers -----*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file enumerates all of the assembly-language printers
-// supported by this build of LLVM. Clients of this file should define
-// the LLVM_ASM_PRINTER macro to be a function-like macro with a
-// single parameter (the name of the target whose assembly can be
-// generated); including this file will then enumerate all of the
-// targets with assembly printers.
-//
-// The set of targets supported by LLVM is generated at configuration
-// time, at which point this header is generated. Do not modify this
-// header directly.
-//
-//===----------------------------------------------------------------------===//
 
-#ifndef LLVM_ASM_PRINTER
-#  error Please define the macro LLVM_ASM_PRINTER(TargetName)
-#endif
-
-LLVM_ASM_PRINTER(Mips) LLVM_ASM_PRINTER(ARM) LLVM_ASM_PRINTER(PowerPC) LLVM_ASM_PRINTER(X86) 
+LLVM_ASM_PRINTER(Mips)
+LLVM_ASM_PRINTER(ARM)
+LLVM_ASM_PRINTER(PowerPC)
+LLVM_ASM_PRINTER(X86)
 
 #undef LLVM_ASM_PRINTER

Modified: projects/clangbsd/lib/clang/include/llvm/Config/Disassemblers.def
==============================================================================
--- projects/clangbsd/lib/clang/include/llvm/Config/Disassemblers.def	Tue Jul 20 07:27:36 2010	(r210287)
+++ projects/clangbsd/lib/clang/include/llvm/Config/Disassemblers.def	Tue Jul 20 10:00:35 2010	(r210288)
@@ -1,30 +1,5 @@
 /* $FreeBSD$ */
-//===- llvm/Config/Disassemblers.def - LLVM Assembly Parsers ----*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file enumerates all of the assembly-language parsers
-// supported by this build of LLVM. Clients of this file should define
-// the LLVM_ASM_PARSER macro to be a function-like macro with a
-// single parameter (the name of the target whose assembly can be
-// generated); including this file will then enumerate all of the
-// targets with assembly parsers.
-//
-// The set of targets supported by LLVM is generated at configuration
-// time, at which point this header is generated. Do not modify this
-// header directly.
-//
-//===----------------------------------------------------------------------===//
 
-#ifndef LLVM_DISASSEMBLER
-#  error Please define the macro LLVM_DISASSEMBLER(TargetName)
-#endif
-
-LLVM_DISASSEMBLER(X86) 
+LLVM_DISASSEMBLER(X86)
 
 #undef LLVM_DISASSEMBLER

Modified: projects/clangbsd/lib/clang/include/llvm/Config/Targets.def
==============================================================================
--- projects/clangbsd/lib/clang/include/llvm/Config/Targets.def	Tue Jul 20 07:27:36 2010	(r210287)
+++ projects/clangbsd/lib/clang/include/llvm/Config/Targets.def	Tue Jul 20 10:00:35 2010	(r210288)
@@ -1,29 +1,8 @@
 /* $FreeBSD$ */
-/*===- llvm/Config/Targets.def - LLVM Target Architectures ------*- C++ -*-===*\
-|*                                                                            *|
-|*                     The LLVM Compiler Infrastructure                       *|
-|*                                                                            *|
-|* This file is distributed under the University of Illinois Open Source      *|
-|* License. See LICENSE.TXT for details.                                      *|
-|*                                                                            *|
-|*===----------------------------------------------------------------------===*|
-|*                                                                            *|
-|* This file enumerates all of the target architectures supported by          *|
-|* this build of LLVM. Clients of this file should define the                 *|
-|* LLVM_TARGET macro to be a function-like macro with a single                *|
-|* parameter (the name of the target); including this file will then          *|
-|* enumerate all of the targets.                                              *|
-|*                                                                            *|
-|* The set of targets supported by LLVM is generated at configuration         *|
-|* time, at which point this header is generated. Do not modify this          *|
-|* header directly.                                                           *|
-|*                                                                            *|
-\*===----------------------------------------------------------------------===*/
 
-#ifndef LLVM_TARGET
-#  error Please define the macro LLVM_TARGET(TargetName)
-#endif
-
-LLVM_TARGET(Mips) LLVM_TARGET(ARM) LLVM_TARGET(PowerPC) LLVM_TARGET(X86) 
+LLVM_TARGET(Mips)
+LLVM_TARGET(ARM)
+LLVM_TARGET(PowerPC)
+LLVM_TARGET(X86)
 
 #undef LLVM_TARGET


More information about the svn-src-projects mailing list