Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Fix version string returned by clang --version.
details: https://anonhg.NetBSD.org/src/rev/afeb852a70fe
branches: trunk
changeset: 779768:afeb852a70fe
user: joerg <joerg%NetBSD.org@localhost>
date: Sun Jun 17 07:40:25 2012 +0000
description:
Fix version string returned by clang --version.
Integrate the in-tree config file generation with the cross-building
toolchain. Regenerate the files.
Keep version numbers all in one place.
diffstat:
external/bsd/llvm/Makefile.inc | 22 +-
external/bsd/llvm/config/clang/Basic/Version.inc | 6 -
external/bsd/llvm/config/clang/Config/config.h | 9 +-
external/bsd/llvm/config/llvm/Config/Disassemblers.def | 2 +-
external/bsd/llvm/config/llvm/Config/config.h | 702 ----------------
external/bsd/llvm/config/llvm/Config/config.h.in | 709 +++++++++++++++++
external/bsd/llvm/config/llvm/Config/llvm-config.h | 118 --
external/bsd/llvm/config/llvm/Config/llvm-config.h.in | 119 ++
external/bsd/llvm/include/Makefile | 62 +-
external/bsd/llvm/lib/libclangBasic/Makefile | 5 +-
tools/llvm-include/Makefile | 4 +-
tools/llvm/Makefile | 18 +-
12 files changed, 919 insertions(+), 857 deletions(-)
diffs (truncated from 1901 to 300 lines):
diff -r 5dc0f745df2b -r afeb852a70fe external/bsd/llvm/Makefile.inc
--- a/external/bsd/llvm/Makefile.inc Sun Jun 17 03:52:32 2012 +0000
+++ b/external/bsd/llvm/Makefile.inc Sun Jun 17 07:40:25 2012 +0000
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile.inc,v 1.36 2012/06/16 17:01:03 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.37 2012/06/17 07:40:25 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include <bsd.own.mk>
-LLVM_REVISION= 158533
-CLANG_REVISION= 158533
+COMMON_REVISION= 158533
+LLVM_REVISION= ${COMMON_REVISION}
+CLANG_REVISION= ${COMMON_REVISION}
+
+LLVM_VERSION= 3.2
+CLANG_VERSION= 3.2
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
@@ -27,14 +31,16 @@
LLVM_INCLUDE_CONFIG= ${LLVM_TOPLEVEL}/config
CLANG_INCLUDE_CONFIG= ${LLVM_TOPLEVEL}/config
LLVM_INCLUDE_OBJDIR!= cd ${LLVM_TOPLEVEL}/include && ${PRINTOBJDIR}
-CPPFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE="\"${MACHINE_GNU_PLATFORM}\""
.endif
CPPFLAGS+= -I${LLVM_INCLUDE_OBJDIR} -I${LLVM_INCLUDE_CONFIG} \
-I${CLANG_INCLUDE_CONFIG}
-# ./configure --enable-targets=x86,powerpc,sparc,arm,mips \
-# --with-c-include-dirs=/usr/include/clang-3.2:/usr/include \
-# --disable-timestamps --prefix=/usr --sysconfdir=/etc/llvm \
-# --disable-threads
+LLVM_CONFIGURE_ARGS= \
+ --enable-targets=x86,powerpc,sparc,arm,mips \
+ --with-c-include-dirs=/usr/include/clang-${CLANG_VERSION}:/usr/include \
+ --disable-timestamps --prefix=/usr --sysconfdir=/etc/llvm \
+ --with-clang-srcdir=${CLANG_SRCDIR} \
+ --host=${MACHINE_GNU_PLATFORM} \
+ llvm_cv_gnu_make_command=${MAKE}
.endif
diff -r 5dc0f745df2b -r afeb852a70fe external/bsd/llvm/config/clang/Basic/Version.inc
--- a/external/bsd/llvm/config/clang/Basic/Version.inc Sun Jun 17 03:52:32 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#define CLANG_VERSION 3.1
-#define CLANG_VERSION_MAJOR 3
-#define CLANG_VERSION_MINOR 1
-#if 0
-#define CLANG_VERSION_PATCHLEVEL
-#endif
diff -r 5dc0f745df2b -r afeb852a70fe external/bsd/llvm/config/clang/Config/config.h
--- a/external/bsd/llvm/config/clang/Config/config.h Sun Jun 17 03:52:32 2012 +0000
+++ b/external/bsd/llvm/config/clang/Config/config.h Sun Jun 17 07:40:25 2012 +0000
@@ -10,13 +10,16 @@
/* Relative directory for resource files */
#define CLANG_RESOURCE_DIR ""
-/* Directory where gcc is installed. */
-#define GCC_INSTALL_PREFIX ""
-
/* Directories clang will search for headers */
#define C_INCLUDE_DIRS "/usr/include/clang-3.2:/usr/include"
+/* Linker version detected at compile time. */
+#define HOST_LINK_VERSION "2.22"
+
/* Default <path> to all compiler invocations for --sysroot=<path>. */
#define DEFAULT_SYSROOT ""
+/* Directory where gcc is installed. */
+#define GCC_INSTALL_PREFIX ""
+
#endif
diff -r 5dc0f745df2b -r afeb852a70fe external/bsd/llvm/config/llvm/Config/Disassemblers.def
--- a/external/bsd/llvm/config/llvm/Config/Disassemblers.def Sun Jun 17 03:52:32 2012 +0000
+++ b/external/bsd/llvm/config/llvm/Config/Disassemblers.def Sun Jun 17 07:40:25 2012 +0000
@@ -24,6 +24,6 @@
# error Please define the macro LLVM_DISASSEMBLER(TargetName)
#endif
-LLVM_DISASSEMBLER(X86) LLVM_DISASSEMBLER(ARM)
+LLVM_DISASSEMBLER(X86) LLVM_DISASSEMBLER(ARM) LLVM_DISASSEMBLER(Mips)
#undef LLVM_DISASSEMBLER
diff -r 5dc0f745df2b -r afeb852a70fe external/bsd/llvm/config/llvm/Config/config.h
--- a/external/bsd/llvm/config/llvm/Config/config.h Sun Jun 17 03:52:32 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,702 +0,0 @@
-/* include/llvm/Config/config.h. Generated from config.h.in by configure. */
-/* include/llvm/Config/config.h.in. Generated from autoconf/configure.ac by autoheader. */
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-/* Bug report URL. */
-#define BUG_REPORT_URL "http://llvm.org/bugs/";
-
-/* Relative directory for resource files */
-#define CLANG_RESOURCE_DIR ""
-
-/* Directories clang will search for headers */
-#define C_INCLUDE_DIRS "/usr/include/clang-3.2:/usr/include"
-
-/* Default <path> to all compiler invocations for --sysroot=<path>. */
-#define DEFAULT_SYSROOT ""
-
-/* Define if position independent code is enabled */
-#define ENABLE_PIC 1
-
-/* Define if timestamp information (e.g., __DATE___) is allowed */
-#define ENABLE_TIMESTAMPS 0
-
-/* Directory where gcc is installed. */
-#define GCC_INSTALL_PREFIX ""
-
-/* Define to 1 if you have the `argz_append' function. */
-/* #undef HAVE_ARGZ_APPEND */
-
-/* Define to 1 if you have the `argz_create_sep' function. */
-/* #undef HAVE_ARGZ_CREATE_SEP */
-
-/* Define to 1 if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
-/* Define to 1 if you have the `argz_insert' function. */
-/* #undef HAVE_ARGZ_INSERT */
-
-/* Define to 1 if you have the `argz_next' function. */
-/* #undef HAVE_ARGZ_NEXT */
-
-/* Define to 1 if you have the `argz_stringify' function. */
-/* #undef HAVE_ARGZ_STRINGIFY */
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the `backtrace' function. */
-/* #undef HAVE_BACKTRACE */
-
-/* Define to 1 if you have the `bcopy' function. */
-/* #undef HAVE_BCOPY */
-
-/* Define to 1 if you have the `ceilf' function. */
-#define HAVE_CEILF 1
-
-/* Define if the neat program is available */
-/* #undef HAVE_CIRCO */
-
-/* Define to 1 if you have the `closedir' function. */
-#define HAVE_CLOSEDIR 1
-
-/* Define to 1 if you have the <CrashReporterClient.h> header file. */
-/* #undef HAVE_CRASHREPORTERCLIENT_H */
-
-/* Define if __crashreporter_info__ exists. */
-#define HAVE_CRASHREPORTER_INFO 0
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have the declaration of `strerror_s', and to 0 if you
- don't. */
-#define HAVE_DECL_STRERROR_S 0
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
- */
-#define HAVE_DIRENT_H 1
-
-/* Define if you have the GNU dld library. */
-/* #undef HAVE_DLD */
-
-/* Define to 1 if you have the <dld.h> header file. */
-/* #undef HAVE_DLD_H */
-
-/* Define to 1 if you have the `dlerror' function. */
-#define HAVE_DLERROR 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define if dlopen() is available on this platform. */
-#define HAVE_DLOPEN 1
-
-/* Define to 1 if you have the <dl.h> header file. */
-/* #undef HAVE_DL_H */
-
-/* Define if the dot program is available */
-/* #undef HAVE_DOT */
-
-/* Define if the dotty program is available */
-/* #undef HAVE_DOTTY */
-
-/* Define if you have the _dyld_func_lookup function. */
-/* #undef HAVE_DYLD */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if the system has the type `error_t'. */
-/* #undef HAVE_ERROR_T */
-
-/* Define to 1 if you have the <execinfo.h> header file. */
-/* #undef HAVE_EXECINFO_H */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define if the neat program is available */
-/* #undef HAVE_FDP */
-
-/* Define to 1 if you have the <fenv.h> header file. */
-#define HAVE_FENV_H 1
-
-/* Define if libffi is available on this platform. */
-/* #undef HAVE_FFI_CALL */
-
-/* Define to 1 if you have the <ffi/ffi.h> header file. */
-/* #undef HAVE_FFI_FFI_H */
-
-/* Define to 1 if you have the <ffi.h> header file. */
-/* #undef HAVE_FFI_H */
-
-/* Set to 1 if the finite function is found in <ieeefp.h> */
-/* #undef HAVE_FINITE_IN_IEEEFP_H */
-
-/* Define to 1 if you have the `floorf' function. */
-#define HAVE_FLOORF 1
-
-/* Define to 1 if you have the `fmodf' function. */
-#define HAVE_FMODF 1
-
-/* Define to 1 if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the `getrlimit' function. */
-#define HAVE_GETRLIMIT 1
-
-/* Define to 1 if you have the `getrusage' function. */
-#define HAVE_GETRUSAGE 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define if the Graphviz program is available */
-/* #undef HAVE_GRAPHVIZ */
-
-/* Define if the gv program is available */
-/* #undef HAVE_GV */
-
-/* Define to 1 if you have the `index' function. */
-/* #undef HAVE_INDEX */
-
-/* Define to 1 if the system has the type `int64_t'. */
-#define HAVE_INT64_T 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `isatty' function. */
-#define HAVE_ISATTY 1
-
-/* Set to 1 if the isinf function is found in <cmath> */
-/* #undef HAVE_ISINF_IN_CMATH */
-
-/* Set to 1 if the isinf function is found in <math.h> */
-#define HAVE_ISINF_IN_MATH_H 1
-
-/* Set to 1 if the isnan function is found in <cmath> */
-/* #undef HAVE_ISNAN_IN_CMATH */
-
-/* Set to 1 if the isnan function is found in <math.h> */
-#define HAVE_ISNAN_IN_MATH_H 1
-
-/* Define if you have the libdl library or equivalent. */
-#define HAVE_LIBDL 1
-
-/* Define to 1 if you have the `imagehlp' library (-limagehlp). */
-/* #undef HAVE_LIBIMAGEHLP */
-
-/* Define to 1 if you have the `m' library (-lm). */
-#define HAVE_LIBM 1
-
-/* Define to 1 if you have the `psapi' library (-lpsapi). */
-/* #undef HAVE_LIBPSAPI */
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-/* #undef HAVE_LIBPTHREAD */
-
-/* Define to 1 if you have the `udis86' library (-ludis86). */
-/* #undef HAVE_LIBUDIS86 */
-
-/* Define to 1 if you have the <limits.h> header file. */
Home |
Main Index |
Thread Index |
Old Index