From peter.senna at gmail.com Tue May 7 07:19:12 2013
From: peter.senna at gmail.com (Peter Senna Tschudin)
Date: Tue, 07 May 2013 14:19:12 -0000
Subject: [vmkit-commits] [vmkit] r181319 - get_started.html updated
Message-ID: <20130507141912.A33492A6C029@llvm.org>
Author: peter.senna
Date: Tue May 7 09:19:12 2013
New Revision: 181319
URL: http://llvm.org/viewvc/llvm-project?rev=181319&view=rev
Log:
get_started.html updated
Modified:
vmkit/trunk/www/get_started.html
Modified: vmkit/trunk/www/get_started.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/get_started.html?rev=181319&r1=181318&r2=181319&view=diff
==============================================================================
--- vmkit/trunk/www/get_started.html (original)
+++ vmkit/trunk/www/get_started.html Tue May 7 09:19:12 2013
@@ -46,7 +46,7 @@ compile vmkit2
./configure --enable-optimized; make
- Skip the Classpath steps if you plan to use OpenJDK instead.
+
Skip the Classpath steps if you plan to use OpenJDK.
Download
GNU Classpath 0.99:
From peter.senna at gmail.com Tue May 7 07:21:52 2013
From: peter.senna at gmail.com (Peter Senna Tschudin)
Date: Tue, 07 May 2013 14:21:52 -0000
Subject: [vmkit-commits] [vmkit] r181320 - tutorial.html updated
Message-ID: <20130507142152.80B262A6C029@llvm.org>
Author: peter.senna
Date: Tue May 7 09:21:52 2013
New Revision: 181320
URL: http://llvm.org/viewvc/llvm-project?rev=181320&view=rev
Log:
tutorial.html updated
Modified:
vmkit/trunk/www/tutorial.html
Modified: vmkit/trunk/www/tutorial.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/tutorial.html?rev=181320&r1=181319&r2=181320&view=diff
==============================================================================
--- vmkit/trunk/www/tutorial.html (original)
+++ vmkit/trunk/www/tutorial.html Tue May 7 09:21:52 2013
@@ -15,7 +15,7 @@
Tutorial: ToyVM
-If you would like to get more familliar with VMKit2 here is a "toyVM"
+
If you would like to get more familliar with VMKit here is a "toyVM"
tutorial which contains.
From peter.senna at gmail.com Tue May 7 07:28:47 2013
From: peter.senna at gmail.com (Peter Senna Tschudin)
Date: Tue, 07 May 2013 14:28:47 -0000
Subject: [vmkit-commits] [vmkit] r181321 - updated index.html
Message-ID: <20130507142847.ED1C42A6C029@llvm.org>
Author: peter.senna
Date: Tue May 7 09:28:47 2013
New Revision: 181321
URL: http://llvm.org/viewvc/llvm-project?rev=181321&view=rev
Log:
updated index.html
Modified:
vmkit/trunk/www/index.html
Modified: vmkit/trunk/www/index.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/index.html?rev=181321&r1=181320&r2=181321&view=diff
==============================================================================
--- vmkit/trunk/www/index.html (original)
+++ vmkit/trunk/www/index.html Tue May 7 09:28:47 2013
@@ -127,8 +127,8 @@
VMKit2
- The project VMKit2, sponsored by Inria and LIP6, was a fork of VMKit
- project that was recently integrated back into VMKit project.
+ The project VMKit2, sponsored by Inria and LIP6, a fork of VMKit
+ project, that was recently integrated back into VMKit project.
From h.bakiras at gmail.com Mon May 13 02:00:34 2013
From: h.bakiras at gmail.com (Harris Bakiras)
Date: Mon, 13 May 2013 09:00:34 -0000
Subject: [vmkit-commits] [vmkit] r181691 - Fixed CLANG path detection
Message-ID: <20130513090034.882DB2A6C029@llvm.org>
Author: harris
Date: Mon May 13 04:00:34 2013
New Revision: 181691
URL: http://llvm.org/viewvc/llvm-project?rev=181691&view=rev
Log:
Fixed CLANG path detection
Modified:
vmkit/trunk/configure
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=181691&r1=181690&r2=181691&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Mon May 13 04:00:34 2013
@@ -2555,7 +2555,7 @@ fi
if test "${with_clang_path+set}" = set; then :
withval=$with_clang_path; CLANG_PATH=$with_clang_path
else
- CLANG_PATH="$(LLVM_CONFIG) --bindir"
+ CLANG_PATH="`$LLVM_CONFIG --bindir`"
fi
From h.bakiras at gmail.com Mon May 27 00:28:38 2013
From: h.bakiras at gmail.com (Harris Bakiras)
Date: Mon, 27 May 2013 07:28:38 -0000
Subject: [vmkit-commits] [vmkit] r182724 - Make handier makefile environment
exportation
Message-ID: <20130527072838.8AADC2A6C02B@llvm.org>
Author: harris
Date: Mon May 27 02:28:38 2013
New Revision: 182724
URL: http://llvm.org/viewvc/llvm-project?rev=182724&view=rev
Log:
Make handier makefile environment exportation
Modified:
vmkit/trunk/Makefile.common.in
vmkit/trunk/Makefile.rules
Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=182724&r1=182723&r2=182724&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Mon May 27 02:28:38 2013
@@ -1,20 +1,4 @@
###############################################################################
-# build system data
-###############################################################################
-PROJECT_NAME := @PACKAGE_NAME@
-PROJ_VERSION := @PACKAGE_VERSION@
-
-realpath=$(shell cd $(1); $(PWD))
-
-PROJ_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
-PROJ_OBJ_ROOT := $(subst //,/, at abs_top_builddir@)
-PROJ_OBJ_CWD:= $(call realpath, .)
-PROJ_SRC_CWD:= $(call realpath, $(patsubst $(PROJ_OBJ_ROOT)%,$(PROJ_SRC_ROOT)%,$(PROJ_OBJ_CWD)))
-
-CONFIG_FILES=@ac_config_files@
-CONFIG_HEADERS=@ac_config_headers@
-
-###############################################################################
# options
###############################################################################
MMTK_PLAN = @MMTK_PLAN@
@@ -62,8 +46,8 @@ WITH_64 = @WITH_64@
###############################################################################
LLVM_CONFIG=@LLVM_CONFIG@
LLVM_BIN=$(shell $(LLVM_CONFIG) --bindir)
-CLANG=@CLANG_PATH@/clang
-CLANGXX=@CLANG_PATH@/clang++
+CLANG=$(LLVM_BIN)/clang
+CLANGXX=$(LLVM_BIN)/clang++
LLVMAS=$(LLVM_BIN)/llvm-as
LLC=$(LLVM_BIN)/llc
LOPT=$(LLVM_BIN)/opt
@@ -83,4 +67,43 @@ MKDIR=@MKDIR_P@
TOUCH=@TOUCH@
GREP=@GREP@
+
+###############################################################################
+# Common build system data
+###############################################################################
+ifeq ($(OPTIMIZED),1)
+ VMKIT_BUILD_NAME:=Release
+ ifeq ($(DEBUG),1)
+ VMKIT_BUILD_NAME:=$(VMKIT_BUILD_NAME)+Debug
+ endif
+else
+ ifeq ($(DEBUG),1)
+ VMKIT_BUILD_NAME:=Debug
+ else
+ VMKIT_BUILD_NAME:=Unoptimized
+ endif
+endif
+
+ifeq ($(ASSERT),1)
+ VMKIT_BUILD_NAME:=$(VMKIT_BUILD_NAME)+Asserts
+endif
+
+ifndef VMKIT_OPTIONS_ONLY
+###############################################################################
+# VMKit build system data
+###############################################################################
+PROJECT_NAME := @PACKAGE_NAME@
+PROJ_VERSION := @PACKAGE_VERSION@
+
+realpath=$(shell cd $(1); $(PWD))
+
+PROJ_SRC_ROOT := $(subst //,/, at abs_top_srcdir@)
+PROJ_OBJ_ROOT := $(subst //,/, at abs_top_builddir@)
+PROJ_OBJ_CWD:= $(call realpath, .)
+PROJ_SRC_CWD:= $(call realpath, $(patsubst $(PROJ_OBJ_ROOT)%,$(PROJ_SRC_ROOT)%,$(PROJ_OBJ_CWD)))
+
+CONFIG_FILES=@ac_config_files@
+CONFIG_HEADERS=@ac_config_headers@
+
include $(PROJ_SRC_ROOT)/Makefile.rules
+endif
Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=182724&r1=182723&r2=182724&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Mon May 27 02:28:38 2013
@@ -9,22 +9,9 @@ all::
###############################################################################
# Main options
###############################################################################
-ifeq ($(OPTIMIZED),1)
- BUILD_NAME:=Release
- ifeq ($(DEBUG),1)
- BUILD_NAME:=$(BUILD_NAME)+Debug
- endif
-else
- ifeq ($(DEBUG),1)
- BUILD_NAME:=Debug
- else
- BUILD_NAME:=Unoptimized
- endif
-endif
+BUILD_NAME=$(VMKIT_BUILD_NAME)
-ifeq ($(ASSERT),1)
- BUILD_NAME:=$(BUILD_NAME)+Asserts
-else
+ifneq ($(ASSERT),1)
COMMON_CFLAGS+=-DNDEBUG
endif
From h.bakiras at gmail.com Mon May 27 03:08:30 2013
From: h.bakiras at gmail.com (Harris Bakiras)
Date: Mon, 27 May 2013 10:08:30 -0000
Subject: [vmkit-commits] [vmkit] r182727 - Added VMKit build name to
configured variables. Fixed ant detection.
Message-ID: <20130527100830.747112A6C02B@llvm.org>
Author: harris
Date: Mon May 27 05:08:29 2013
New Revision: 182727
URL: http://llvm.org/viewvc/llvm-project?rev=182727&view=rev
Log:
Added VMKit build name to configured variables. Fixed ant detection.
Modified:
vmkit/trunk/Makefile.common.in
vmkit/trunk/Makefile.rules
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=182727&r1=182726&r2=182727&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Mon May 27 05:08:29 2013
@@ -40,6 +40,7 @@ EXEEXT=@EXEEXT@
SHLIBEXT=@SHLIBEXT@
WITH_64 = @WITH_64@
+VMKIT_BUILD_NAME=@VMKIT_BUILD_NAME@
###############################################################################
# binaries
@@ -72,20 +73,20 @@ GREP=@GREP@
# Common build system data
###############################################################################
ifeq ($(OPTIMIZED),1)
- VMKIT_BUILD_NAME:=Release
+ BUILD_NAME:=Release
ifeq ($(DEBUG),1)
- VMKIT_BUILD_NAME:=$(VMKIT_BUILD_NAME)+Debug
+ BUILD_NAME:=$(BUILD_NAME)+Debug
endif
else
ifeq ($(DEBUG),1)
- VMKIT_BUILD_NAME:=Debug
+ BUILD_NAME:=Debug
else
- VMKIT_BUILD_NAME:=Unoptimized
+ BUILD_NAME:=Unoptimized
endif
endif
ifeq ($(ASSERT),1)
- VMKIT_BUILD_NAME:=$(VMKIT_BUILD_NAME)+Asserts
+ BUILD_NAME:=$(BUILD_NAME)+Asserts
endif
ifndef VMKIT_OPTIONS_ONLY
Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=182727&r1=182726&r2=182727&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Mon May 27 05:08:29 2013
@@ -9,8 +9,6 @@ all::
###############################################################################
# Main options
###############################################################################
-BUILD_NAME=$(VMKIT_BUILD_NAME)
-
ifneq ($(ASSERT),1)
COMMON_CFLAGS+=-DNDEBUG
endif
@@ -86,7 +84,7 @@ tidy:
clean::
$(Echo) "Cleaning compilation files"
- $(Verb) rm -Rf $(BUILD_NAME)
+ $(Verb) rm -Rf $(BUILD_NAME) $(VMKIT_BUILD_NAME)
distclean::
$(Echo) "Cleaning all compilation files"
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=182727&r1=182726&r2=182727&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Mon May 27 05:08:29 2013
@@ -200,6 +200,25 @@ case "$enable_assert" in
*) AC_MSG_ERROR([Invalid setting for --enable-assert. Use "yes" or "no"]) ;;
esac
+if test "$enable_optimized" = "yes"; then
+ VMKIT_BUILD_NAME=Release
+ if test "$enable_debug" = "yes"; then
+ VMKIT_BUILD_NAME="$VMKIT_BUILD_NAME"+Debug
+ fi
+else
+ if test "$enable_debug" = "yes"; then
+ VMKIT_BUILD_NAME=Debug
+ else
+ VMKIT_BUILD_NAME=Unoptimized
+ fi
+fi
+
+if test "$enable_assert" = "yes"; then
+ VMKIT_BUILD_NAME="$VMKIT_BUILD_NAME"+Asserts
+fi
+
+AC_SUBST([VMKIT_BUILD_NAME], ["$VMKIT_BUILD_NAME"])
+
dnl **************************************************************************
dnl llvm
dnl **************************************************************************
@@ -221,7 +240,7 @@ AC_ARG_WITH(clang-path,
[AS_HELP_STRING(--with-clang-path=path,
[clang path (use default path)])],
[[CLANG_PATH=$with_clang_path]],
- [[CLANG_PATH="$(LLVM_CONFIG) --bindir"]]
+ [[CLANG_PATH="`$LLVM_CONFIG --bindir`"]]
)
if test ! -x "$CLANG_PATH"; then
@@ -363,6 +382,10 @@ AC_PATH_PROG(ZIP, [zip], [zip])
AC_PATH_PROG(LLVM_CONFIG, [llvm-config],,[`AS_DIRNAME(["$LLVM_CONFIG_PATH"])`:$PATH])
+if test -z ${ANT}; then
+ AC_MSG_ERROR([Unable to find ant, please put ant tool in your path])
+fi
+
if test -z ${LLVM_CONFIG}; then
AC_MSG_ERROR([Unable to find llvm-config, please specify its path])
fi
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=182727&r1=182726&r2=182727&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Mon May 27 05:08:29 2013
@@ -1,11 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for vmkit 0.32svn.
+# Generated by GNU Autoconf 2.68 for vmkit 0.32svn.
#
# Report bugs to .
#
#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,31 +138,6 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# Use a proper internal environment variable to ensure we don't fall
- # into an infinite loop, continuously re-executing ourselves.
- if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
- _as_can_reexec=no; export _as_can_reexec;
- # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
- fi
- # We don't want this to propagate to other subprocesses.
- { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -194,8 +171,7 @@ if ( set x; as_fn_ret_success y && test
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -240,25 +216,21 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- export CONFIG_SHELL
- # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ # Preserve -v and -x to the replacement shell.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+ case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+ esac
+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -361,14 +333,6 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
- test -f "$1" && test -x "$1"
-} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -490,10 +454,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
- # already done that, so ensure we don't try to do so again and fall
- # in an infinite loop. This has already happened in practice.
- _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -528,16 +488,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -pR'.
+ # In both cases, we have to default to `cp -p'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -549,8 +509,28 @@ else
as_mkdir_p=false
fi
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in #(
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -663,6 +643,7 @@ classpathglibj
MMTK_PLAN
GC_FLAGS
CLANG_PATH
+VMKIT_BUILD_NAME
ASSERT
DEBUG
OPTIMIZED
@@ -1202,6 +1183,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1464,9 +1447,9 @@ test -n "$ac_init_help" && exit $ac_stat
if $ac_init_version; then
cat <<\_ACEOF
vmkit configure 0.32svn
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.68
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
@@ -1544,7 +1527,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- test -x conftest$ac_exeext
+ $as_test_x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1889,7 +1872,7 @@ This file contains any messages produced
running configure, to aid debugging if configure makes a mistake.
It was created by vmkit $as_me 0.32svn, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2536,6 +2519,26 @@ case "$enable_assert" in
*) as_fn_error $? "Invalid setting for --enable-assert. Use \"yes\" or \"no\"" "$LINENO" 5 ;;
esac
+if test "$enable_optimized" = "yes"; then
+ VMKIT_BUILD_NAME=Release
+ if test "$enable_debug" = "yes"; then
+ VMKIT_BUILD_NAME="$VMKIT_BUILD_NAME"+Debug
+ fi
+else
+ if test "$enable_debug" = "yes"; then
+ VMKIT_BUILD_NAME=Debug
+ else
+ VMKIT_BUILD_NAME=Unoptimized
+ fi
+fi
+
+if test "$enable_assert" = "yes"; then
+ VMKIT_BUILD_NAME="$VMKIT_BUILD_NAME"+Asserts
+fi
+
+VMKIT_BUILD_NAME="$VMKIT_BUILD_NAME"
+
+
# Check whether --with-llvm-config-path was given.
if test "${with_llvm_config_path+set}" = set; then :
@@ -2998,7 +3001,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3039,7 +3042,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3078,7 +3081,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_GREP" || continue
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -3138,7 +3141,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -3185,7 +3188,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3226,7 +3229,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3267,7 +3270,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3308,7 +3311,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3348,7 +3351,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3388,7 +3391,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3442,7 +3445,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3482,7 +3485,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_JAVAC="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3523,7 +3526,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3588,7 +3591,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_LLVM_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3611,6 +3614,10 @@ fi
+if test -z ${ANT}; then
+ as_fn_error $? "Unable to find ant, please put ant tool in your path" "$LINENO" 5
+fi
+
if test -z ${LLVM_CONFIG}; then
as_fn_error $? "Unable to find llvm-config, please specify its path" "$LINENO" 5
fi
@@ -3657,7 +3664,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -3737,7 +3744,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3777,7 +3784,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3830,7 +3837,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3871,7 +3878,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -3929,7 +3936,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3973,7 +3980,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4419,7 +4426,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
/* end confdefs.h. */
#include
#include
-struct stat;
+#include
+#include
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4714,7 +4722,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP" || continue
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -5439,16 +5447,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -pR'.
+ # In both cases, we have to default to `cp -p'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
else
- as_ln_s='cp -pR'
+ as_ln_s='cp -p'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -5508,16 +5516,28 @@ else
as_mkdir_p=false
fi
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
- test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in #(
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -5539,7 +5559,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# values after options handling.
ac_log="
This file was extended by vmkit $as_me 0.32svn, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -5601,10 +5621,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
vmkit config.status 0.32svn
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -5694,7 +5714,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
From h.bakiras at gmail.com Thu May 30 15:15:52 2013
From: h.bakiras at gmail.com (Harris Bakiras)
Date: Thu, 30 May 2013 22:15:52 -0000
Subject: [vmkit-commits] [vmkit] r182967 - Restored some needed dependencies
to VirtualTables.
Message-ID: <20130530221552.D7EF82A6C02E@llvm.org>
Author: harris
Date: Thu May 30 17:15:52 2013
New Revision: 182967
URL: http://llvm.org/viewvc/llvm-project?rev=182967&view=rev
Log:
Restored some needed dependencies to VirtualTables.
Modified:
vmkit/trunk/include/vmkit/VirtualMachine.h
vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp
vmkit/trunk/lib/j3/VMCore/Jnjvm.h
vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
Modified: vmkit/trunk/include/vmkit/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/vmkit/VirtualMachine.h?rev=182967&r1=182966&r2=182967&view=diff
==============================================================================
--- vmkit/trunk/include/vmkit/VirtualMachine.h (original)
+++ vmkit/trunk/include/vmkit/VirtualMachine.h Thu May 30 17:15:52 2013
@@ -205,7 +205,7 @@ public:
/// set the identity of the object (identity is determined by user).
///
virtual void setType(gc* header, void* type) = 0;
- virtual void setType(void* header, void* type) = 0;
+// virtual void setType(void* header, void* type) = 0;
/// getType - Gets the type of given object.
///
Modified: vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp?rev=182967&r1=182966&r2=182967&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp Thu May 30 17:15:52 2013
@@ -1475,10 +1475,10 @@ void Jnjvm::setType(gc* header, void* ty
src->setVirtualTable((JavaVirtualTable*)type);
}
-void Jnjvm::setType(void* header, void* type)
-{
- ((JavaObject*)header)->setVirtualTable((JavaVirtualTable*)type);
-}
+//void Jnjvm::setType(void* header, void* type)
+//{
+// ((JavaObject*)header)->setVirtualTable((JavaVirtualTable*)type);
+//}
void* Jnjvm::getType(gc* header) {
JavaObject* src = 0;
Modified: vmkit/trunk/lib/j3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jnjvm.h?rev=182967&r1=182966&r2=182967&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/j3/VMCore/Jnjvm.h Thu May 30 17:15:52 2013
@@ -137,7 +137,7 @@ private:
virtual void finalizeObject(gc* res);
virtual void traceObject(gc* obj, word_t closure);
virtual void setType(gc* header, void* type);
- virtual void setType(void* header, void* type);
+// virtual void setType(void* header, void* type);
virtual void* getType(gc* obj);
virtual size_t getObjectSize(gc* obj);
virtual const char* getObjectTypeName(gc* obj);
Modified: vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp?rev=182967&r1=182966&r2=182967&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp Thu May 30 17:15:52 2013
@@ -298,7 +298,8 @@ extern "C" void* MMTkMutatorAllocate(uin
size = llvm::RoundUpToAlignment(size, sizeof(void*));
head = (gcHeader*)MutatorThread::get()->Allocator.Allocate(size);
void* val = head->toReference();
- vmkit::Thread::get()->MyVM->setType(val, type);
+ VirtualTable::setVirtualTable((gc*)val, (VirtualTable*)type);
+// vmkit::Thread::get()->MyVM->setType(val, type);
return val;
}
From h.bakiras at gmail.com Thu May 30 15:16:56 2013
From: h.bakiras at gmail.com (Harris Bakiras)
Date: Thu, 30 May 2013 22:16:56 -0000
Subject: [vmkit-commits] [vmkit] r182968 - Make Makefiles variable exporting
handier for external projects.
Message-ID: <20130530221656.D1A852A6C02E@llvm.org>
Author: harris
Date: Thu May 30 17:16:56 2013
New Revision: 182968
URL: http://llvm.org/viewvc/llvm-project?rev=182968&view=rev
Log:
Make Makefiles variable exporting handier for external projects.
Modified:
vmkit/trunk/Makefile.common.in
vmkit/trunk/Makefile.rules
Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=182968&r1=182967&r2=182968&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Thu May 30 17:16:56 2013
@@ -40,7 +40,6 @@ EXEEXT=@EXEEXT@
SHLIBEXT=@SHLIBEXT@
WITH_64 = @WITH_64@
-VMKIT_BUILD_NAME=@VMKIT_BUILD_NAME@
###############################################################################
# binaries
@@ -73,23 +72,23 @@ GREP=@GREP@
# Common build system data
###############################################################################
ifeq ($(OPTIMIZED),1)
- BUILD_NAME:=Release
+ VMKIT_BUILD_NAME:=Release
ifeq ($(DEBUG),1)
- BUILD_NAME:=$(BUILD_NAME)+Debug
+ VMKIT_BUILD_NAME:=$(VMKIT_BUILD_NAME)+Debug
endif
else
ifeq ($(DEBUG),1)
- BUILD_NAME:=Debug
+ VMKIT_BUILD_NAME:=Debug
else
- BUILD_NAME:=Unoptimized
+ VMKIT_BUILD_NAME:=Unoptimized
endif
endif
ifeq ($(ASSERT),1)
- BUILD_NAME:=$(BUILD_NAME)+Asserts
+ VMKIT_BUILD_NAME:=$(VMKIT_BUILD_NAME)+Asserts
endif
-ifndef VMKIT_OPTIONS_ONLY
+ifndef OPTIONS_ONLY
###############################################################################
# VMKit build system data
###############################################################################
Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=182968&r1=182967&r2=182968&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu May 30 17:16:56 2013
@@ -9,6 +9,8 @@ all::
###############################################################################
# Main options
###############################################################################
+BUILD_NAME=$(VMKIT_BUILD_NAME)
+
ifneq ($(ASSERT),1)
COMMON_CFLAGS+=-DNDEBUG
endif
@@ -84,7 +86,7 @@ tidy:
clean::
$(Echo) "Cleaning compilation files"
- $(Verb) rm -Rf $(BUILD_NAME) $(VMKIT_BUILD_NAME)
+ $(Verb) rm -Rf $(BUILD_NAME)
distclean::
$(Echo) "Cleaning all compilation files"
From peter.senna at gmail.com Mon May 6 08:19:28 2013
From: peter.senna at gmail.com (Peter Senna Tschudin)
Date: Mon, 06 May 2013 15:19:28 -0000
Subject: [vmkit-commits] [vmkit] r181198 - Changed isEqual to vmkIsEqual to
avoid conflict with other software
Message-ID: <20130506151910.33D392A6C029@llvm.org>
Author: peter.senna
Date: Mon May 6 10:19:09 2013
New Revision: 181198
URL: http://llvm.org/viewvc/llvm-project?rev=181198&view=rev
Log:
Changed isEqual to vmkIsEqual to avoid conflict with other software
Modified:
vmkit/trunk/include/vmkit/UTF8.h
vmkit/trunk/include/vmkit/VmkitDenseMap.h
vmkit/trunk/include/vmkit/VmkitDenseSet.h
Modified: vmkit/trunk/include/vmkit/UTF8.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/vmkit/UTF8.h?rev=181198&r1=181197&r2=181198&view=diff
==============================================================================
--- vmkit/trunk/include/vmkit/UTF8.h (original)
+++ vmkit/trunk/include/vmkit/UTF8.h Mon May 6 10:19:09 2013
@@ -95,8 +95,8 @@ struct VmkitDenseMapInfo {
static unsigned getHashValue(const UTF8* PtrVal) {
return PtrVal->hash();
}
- static bool isEqual(const UTF8* LHS, const UTF8* RHS) { return LHS->equals(RHS); }
- static bool isEqualKey(const UTF8* LHS, const UTF8MapKey& Key) {
+ static bool vmkIsEqual(const UTF8* LHS, const UTF8* RHS) { return LHS->equals(RHS); }
+ static bool vmkIsEqualKey(const UTF8* LHS, const UTF8MapKey& Key) {
return LHS->equals(Key.data, Key.length);
}
static UTF8MapKey toKey(const UTF8* utf8) {
@@ -119,7 +119,7 @@ struct VmkitDenseMapInfo {
static unsigned getHashValue(const UTF8MapKey& key) {
return UTF8::readerHasher(key.data, key.length);
}
- static bool isEqual(const UTF8MapKey& LHS, const UTF8MapKey& RHS) {
+ static bool vmkIsEqual(const UTF8MapKey& LHS, const UTF8MapKey& RHS) {
if (LHS.data == RHS.data) return true;
if (LHS.length != RHS.length) return false;
return !memcmp(LHS.data, RHS.data, RHS.length * sizeof(uint16));
Modified: vmkit/trunk/include/vmkit/VmkitDenseMap.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/vmkit/VmkitDenseMap.h?rev=181198&r1=181197&r2=181198&view=diff
==============================================================================
--- vmkit/trunk/include/vmkit/VmkitDenseMap.h (original)
+++ vmkit/trunk/include/vmkit/VmkitDenseMap.h Mon May 6 10:19:09 2013
@@ -33,7 +33,7 @@ struct VmkitDenseMapInfo {
//static inline T getEmptyKey();
//static inline T getTombstoneKey();
//static unsigned getHashValue(const T &Val);
- //static bool isEqual(const T &LHS, const T &RHS);
+ //static bool vmkIsEqual(const T &LHS, const T &RHS);
};
templatefirst, EmptyKey) &&
- !KeyInfoT::isEqual(P->first, TombstoneKey))
+ if (!KeyInfoT::vmkIsEqual(P->first, EmptyKey) &&
+ !KeyInfoT::vmkIsEqual(P->first, TombstoneKey))
P->second.~ValueT();
P->first.~KeyT();
}
@@ -122,8 +122,8 @@ public:
const KeyT EmptyKey = getEmptyKey(), TombstoneKey = getTombstoneKey();
for (BucketT *P = Buckets, *E = Buckets+NumBuckets; P != E; ++P) {
- if (!KeyInfoT::isEqual(P->first, EmptyKey)) {
- if (!KeyInfoT::isEqual(P->first, TombstoneKey)) {
+ if (!KeyInfoT::vmkIsEqual(P->first, EmptyKey)) {
+ if (!KeyInfoT::vmkIsEqual(P->first, TombstoneKey)) {
P->second.~ValueT();
--NumEntries;
}
@@ -258,7 +258,7 @@ private:
}
// If we are writing over a tombstone, remember this.
- if (!KeyInfoT::isEqual(TheBucket->first, getEmptyKey()))
+ if (!KeyInfoT::vmkIsEqual(TheBucket->first, getEmptyKey()))
--NumTombstones;
TheBucket->first = Key;
@@ -294,21 +294,21 @@ private:
BucketT *FoundTombstone = 0;
const KeyT EmptyKey = getEmptyKey();
const KeyT TombstoneKey = getTombstoneKey();
- assert(!KeyInfoT::isEqual(Val, EmptyKey) &&
- !KeyInfoT::isEqual(Val, TombstoneKey) &&
+ assert(!KeyInfoT::vmkIsEqual(Val, EmptyKey) &&
+ !KeyInfoT::vmkIsEqual(Val, TombstoneKey) &&
"Empty/Tombstone value shouldn't be inserted into map!");
while (1) {
BucketT *ThisBucket = BucketsPtr + (BucketNo & (NumBuckets-1));
// Found Val's bucket? If so, return it.
- if (KeyInfoT::isEqual(ThisBucket->first, Val)) {
+ if (KeyInfoT::vmkIsEqual(ThisBucket->first, Val)) {
FoundBucket = ThisBucket;
return true;
}
// If we found an empty bucket, the key doesn't exist in the set.
// Insert it and return the default value.
- if (KeyInfoT::isEqual(ThisBucket->first, EmptyKey)) {
+ if (KeyInfoT::vmkIsEqual(ThisBucket->first, EmptyKey)) {
// If we've already seen a tombstone while probing, fill it in instead
// of the empty bucket we eventually probed to.
if (FoundTombstone) ThisBucket = FoundTombstone;
@@ -318,7 +318,7 @@ private:
// If this is a tombstone, remember it. If Val ends up not in the map, we
// prefer to return it than something that would require more probing.
- if (KeyInfoT::isEqual(ThisBucket->first, TombstoneKey) && !FoundTombstone)
+ if (KeyInfoT::vmkIsEqual(ThisBucket->first, TombstoneKey) && !FoundTombstone)
FoundTombstone = ThisBucket; // Remember the first tombstone found.
// Otherwise, it's a hash collision or a tombstone, continue quadratic
@@ -367,8 +367,8 @@ private:
// Insert all the old elements.
const KeyT TombstoneKey = getTombstoneKey();
for (BucketT *B = OldBuckets, *E = OldBuckets+OldNumBuckets; B != E; ++B) {
- if (!KeyInfoT::isEqual(B->first, EmptyKey) &&
- !KeyInfoT::isEqual(B->first, TombstoneKey)) {
+ if (!KeyInfoT::vmkIsEqual(B->first, EmptyKey) &&
+ !KeyInfoT::vmkIsEqual(B->first, TombstoneKey)) {
// Insert the key/value into the new table.
BucketT *DestBucket;
bool FoundVal = LookupBucketFor(B->first, DestBucket);
@@ -413,8 +413,8 @@ private:
// Free the old buckets.
const KeyT TombstoneKey = getTombstoneKey();
for (BucketT *B = OldBuckets, *E = OldBuckets+OldNumBuckets; B != E; ++B) {
- if (!KeyInfoT::isEqual(B->first, EmptyKey) &&
- !KeyInfoT::isEqual(B->first, TombstoneKey)) {
+ if (!KeyInfoT::vmkIsEqual(B->first, EmptyKey) &&
+ !KeyInfoT::vmkIsEqual(B->first, TombstoneKey)) {
// Free the value.
B->second.~ValueT();
}
@@ -501,8 +501,8 @@ private:
const KeyT Tombstone = KeyInfoT::getTombstoneKey();
while (Ptr != End &&
- (KeyInfoT::isEqual(Ptr->first, Empty) ||
- KeyInfoT::isEqual(Ptr->first, Tombstone)))
+ (KeyInfoT::vmkIsEqual(Ptr->first, Empty) ||
+ KeyInfoT::vmkIsEqual(Ptr->first, Tombstone)))
++Ptr;
}
};
Modified: vmkit/trunk/include/vmkit/VmkitDenseSet.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/vmkit/VmkitDenseSet.h?rev=181198&r1=181197&r2=181198&view=diff
==============================================================================
--- vmkit/trunk/include/vmkit/VmkitDenseSet.h (original)
+++ vmkit/trunk/include/vmkit/VmkitDenseSet.h Mon May 6 10:19:09 2013
@@ -59,8 +59,8 @@ public:
~VmkitDenseSet() {
const ValueT EmptyValue = getEmptyValue(), TombstoneValue = getTombstoneValue();
for (BucketT *P = Buckets, *E = Buckets+NumBuckets; P != E; ++P) {
- if (!ValueInfoT::isEqual(*P, EmptyValue) &&
- !ValueInfoT::isEqual(*P, TombstoneValue))
+ if (!ValueInfoT::vmkIsEqual(*P, EmptyValue) &&
+ !ValueInfoT::vmkIsEqual(*P, TombstoneValue))
(*P).~ValueT();
}
#ifndef NDEBUG
@@ -109,8 +109,8 @@ public:
const ValueT EmptyValue = getEmptyValue(), TombstoneValue = getTombstoneValue();
for (BucketT *P = Buckets, *E = Buckets+NumBuckets; P != E; ++P) {
- if (!ValueInfoT::isEqual(*P, EmptyValue)) {
- if (!ValueInfoT::isEqual(*P, TombstoneValue)) {
+ if (!ValueInfoT::vmkIsEqual(*P, EmptyValue)) {
+ if (!ValueInfoT::vmkIsEqual(*P, TombstoneValue)) {
P->~ValueT();
--NumEntries;
}
@@ -244,7 +244,7 @@ private:
}
// If we are writing over a tombstone, remember this.
- if (!ValueInfoT::isEqual(*TheBucket, getEmptyValue()))
+ if (!ValueInfoT::vmkIsEqual(*TheBucket, getEmptyValue()))
--NumTombstones;
new (TheBucket) ValueT(Value);
@@ -283,14 +283,14 @@ private:
while (1) {
BucketT *ThisBucket = BucketsPtr + (BucketNo & (NumBuckets-1));
// Found Val's bucket? If so, return it.
- if (ValueInfoT::isEqualKey(*ThisBucket, Key)) {
+ if (ValueInfoT::vmkIsEqualKey(*ThisBucket, Key)) {
FoundBucket = ThisBucket;
return true;
}
// If we found an empty bucket, the key doesn't exist in the set.
// Insert it and return the default value.
- if (ValueInfoT::isEqual(*ThisBucket, EmptyValue)) {
+ if (ValueInfoT::vmkIsEqual(*ThisBucket, EmptyValue)) {
// If we've already seen a tombstone while probing, fill it in instead
// of the empty bucket we eventually probed to.
if (FoundTombstone) ThisBucket = FoundTombstone;
@@ -300,7 +300,7 @@ private:
// If this is a tombstone, remember it. If Val ends up not in the map, we
// prefer to return it than something that would require more probing.
- if (ValueInfoT::isEqual(*ThisBucket, TombstoneValue) && !FoundTombstone)
+ if (ValueInfoT::vmkIsEqual(*ThisBucket, TombstoneValue) && !FoundTombstone)
FoundTombstone = ThisBucket; // Remember the first tombstone found.
// Otherwise, it's a hash collision or a tombstone, continue quadratic
@@ -349,8 +349,8 @@ private:
// Insert all the old elements.
const ValueT TombstoneValue = getTombstoneValue();
for (BucketT *B = OldBuckets, *E = OldBuckets+OldNumBuckets; B != E; ++B) {
- if (!ValueInfoT::isEqual(*B, EmptyValue) &&
- !ValueInfoT::isEqual(*B, TombstoneValue)) {
+ if (!ValueInfoT::vmkIsEqual(*B, EmptyValue) &&
+ !ValueInfoT::vmkIsEqual(*B, TombstoneValue)) {
// Insert the value into the new table.
BucketT *DestBucket;
KeyT key = ValueInfoT::toKey(*B);
@@ -394,8 +394,8 @@ private:
// Free the old buckets.
const ValueT TombstoneValue = getTombstoneValue();
for (BucketT *B = OldBuckets, *E = OldBuckets+OldNumBuckets; B != E; ++B) {
- if (!ValueInfoT::isEqual(*B, EmptyValue) &&
- !ValueInfoT::isEqual(*B, TombstoneValue)) {
+ if (!ValueInfoT::vmkIsEqual(*B, EmptyValue) &&
+ !ValueInfoT::vmkIsEqual(*B, TombstoneValue)) {
// Free the value.
(*B).~ValueT();
}
@@ -480,8 +480,8 @@ private:
const ValueT Tombstone = ValueInfoT::getTombstoneKey();
while (Ptr != End &&
- (ValueInfoT::isEqual(*Ptr, Empty) ||
- ValueInfoT::isEqual(*Ptr, Tombstone)))
+ (ValueInfoT::vmkIsEqual(*Ptr, Empty) ||
+ ValueInfoT::vmkIsEqual(*Ptr, Tombstone)))
++Ptr;
}
};
From sylvestre at debian.org Tue May 7 02:51:47 2013
From: sylvestre at debian.org (Sylvestre Ledru)
Date: Tue, 07 May 2013 09:51:47 -0000
Subject: [vmkit-commits] [vmkit] r181300 - Add the option to the configure
'--with-clang-path=' to set the path to clang and clang++
Message-ID: <20130507095129.548312A6C029@llvm.org>
Author: sylvestre
Date: Tue May 7 04:51:28 2013
New Revision: 181300
URL: http://llvm.org/viewvc/llvm-project?rev=181300&view=rev
Log:
Add the option to the configure '--with-clang-path=' to set the path to clang and clang++
Modified:
vmkit/trunk/Makefile.common.in
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=181300&r1=181299&r2=181300&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Tue May 7 04:51:28 2013
@@ -62,8 +62,8 @@ WITH_64 = @WITH_64@
###############################################################################
LLVM_CONFIG=@LLVM_CONFIG@
LLVM_BIN=$(shell $(LLVM_CONFIG) --bindir)
-CLANG=$(LLVM_BIN)/clang
-CLANGXX=$(LLVM_BIN)/clang++
+CLANG=@CLANG_PATH@/clang
+CLANGXX=@CLANG_PATH@/clang++
LLVMAS=$(LLVM_BIN)/llvm-as
LLC=$(LLVM_BIN)/llc
LOPT=$(LLVM_BIN)/opt
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=181300&r1=181299&r2=181300&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Tue May 7 04:51:28 2013
@@ -211,6 +211,17 @@ AC_ARG_WITH(llvm-config-path,
)
dnl **************************************************************************
+dnl clang
+dnl **************************************************************************
+AC_ARG_WITH(clang-path,
+ [AS_HELP_STRING(--with-clang-path=path,
+ [clang path (use default path)])],
+ [[CLANG_PATH=$withval]],
+ [[CLANG_PATH="$(LLVM_CONFIG) --bindir"]]
+)
+AC_SUBST([CLANG_PATH])
+
+dnl **************************************************************************
dnl GC type
dnl **************************************************************************
AC_ARG_WITH(mmtk-plan,
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=181300&r1=181299&r2=181300&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Tue May 7 04:51:28 2013
@@ -662,6 +662,7 @@ classpathlibs
classpathglibj
MMTK_PLAN
GC_FLAGS
+CLANG_PATH
ASSERT
DEBUG
OPTIMIZED
@@ -729,6 +730,7 @@ enable_optimized
enable_debug
enable_assert
with_llvm_config_path
+with_clang_path
with_mmtk_plan
with_gnu_classpath_libs
with_gnu_classpath_glibj
@@ -1371,6 +1373,7 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-llvm-config-path=path
llvm-config path (use default path)
+ --with-clang-path=path clang path (use default path)
--with-mmtk-plan=something
MMTk plan type ('org.mmtk.plan.marksweep.MS')
--with-gnu-classpath-libs=something
@@ -2544,6 +2547,17 @@ fi
+# Check whether --with-clang-path was given.
+if test "${with_clang_path+set}" = set; then :
+ withval=$with_clang_path; CLANG_PATH=$withval
+else
+ CLANG_PATH="$(LLVM_CONFIG) --bindir"
+
+fi
+
+
+
+
# Check whether --with-mmtk-plan was given.
if test "${with_mmtk_plan+set}" = set; then :
withval=$with_mmtk_plan; MMTK_PLAN=$withval
From sylvestre at debian.org Tue May 7 02:52:09 2013
From: sylvestre at debian.org (Sylvestre Ledru)
Date: Tue, 07 May 2013 09:52:09 -0000
Subject: [vmkit-commits] [vmkit] r181301 - Fix a problem with the configure
option '--with-llvm-config-path': Makefile.common.in expects
Message-ID: <20130507095155.446162A6C029@llvm.org>
Author: sylvestre
Date: Tue May 7 04:51:54 2013
New Revision: 181301
URL: http://llvm.org/viewvc/llvm-project?rev=181301&view=rev
Log:
Fix a problem with the configure option '--with-llvm-config-path': Makefile.common.in expects
LLVM_CONFIG and not LLVM_CONFIG_PATH
Modified:
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=181301&r1=181300&r2=181301&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Tue May 7 04:51:54 2013
@@ -206,8 +206,8 @@ dnl ************************************
AC_ARG_WITH(llvm-config-path,
[AS_HELP_STRING(--with-llvm-config-path=path,
[llvm-config path (use default path)])],
- [[LLVM_CONFIG_PATH=$withval]],
- [[LLVM_CONFIG_PATH="llvm-config"]]
+ [[LLVM_CONFIG=$withval]],
+ [[LLVM_CONFIG="llvm-config"]]
)
dnl **************************************************************************
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=181301&r1=181300&r2=181301&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Tue May 7 04:51:54 2013
@@ -2539,9 +2539,9 @@ esac
# Check whether --with-llvm-config-path was given.
if test "${with_llvm_config_path+set}" = set; then :
- withval=$with_llvm_config_path; LLVM_CONFIG_PATH=$withval
+ withval=$with_llvm_config_path; LLVM_CONFIG=$withval
else
- LLVM_CONFIG_PATH="llvm-config"
+ LLVM_CONFIG="llvm-config"
fi
From sylvestre at debian.org Tue May 7 02:52:41 2013
From: sylvestre at debian.org (Sylvestre Ledru)
Date: Tue, 07 May 2013 09:52:41 -0000
Subject: [vmkit-commits] [vmkit] r181302 - Get rid of the configure usage of
enableval and withval to use the named variable. It improves the readbility
Message-ID: <20130507095227.BA9A32A6C029@llvm.org>
Author: sylvestre
Date: Tue May 7 04:52:27 2013
New Revision: 181302
URL: http://llvm.org/viewvc/llvm-project?rev=181302&view=rev
Log:
Get rid of the configure usage of enableval and withval to use the named variable. It improves the readbility
and the maintenance of the build system
Modified:
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=181302&r1=181301&r2=181302&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Tue May 7 04:52:27 2013
@@ -172,8 +172,8 @@ dnl ************************************
AC_ARG_ENABLE(optimized,
AS_HELP_STRING([--enable-optimized],
[Build with all optimization flag enable (default is yes)]),,
- enableval=yes)
-case "$enableval" in
+ enable_optimized=yes)
+case "$enable_optimized" in
yes) AC_SUBST(OPTIMIZED,[1]) ;;
no) AC_SUBST(OPTIMIZED,[0]) ;;
*) AC_MSG_ERROR([Invalid setting for --enable-optimized. Use "yes" or "no"]) ;;
@@ -182,8 +182,8 @@ esac
AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug],
[Build with debug flags (default is no)]),,
- enableval=no)
-case "$enableval" in
+ enable_debug=no)
+case "$enable_debug" in
yes) AC_SUBST(DEBUG,[1]) ;;
no) AC_SUBST(DEBUG,[0]) ;;
*) AC_MSG_ERROR([Invalid setting for --enable-debug. Use "yes" or "no"]) ;;
@@ -192,9 +192,9 @@ esac
AC_ARG_ENABLE(assert,
AS_HELP_STRING([--enable-assert],
[Build with assert flags (default is yes)]),,
- enableval=yes)
+ enable_assert=yes)
-case "$enableval" in
+case "$enable_assert" in
yes) AC_SUBST(ASSERT,[1]) ;;
no) AC_SUBST(ASSERT,[0]) ;;
*) AC_MSG_ERROR([Invalid setting for --enable-assert. Use "yes" or "no"]) ;;
@@ -206,7 +206,7 @@ dnl ************************************
AC_ARG_WITH(llvm-config-path,
[AS_HELP_STRING(--with-llvm-config-path=path,
[llvm-config path (use default path)])],
- [[LLVM_CONFIG=$withval]],
+ [[LLVM_CONFIG=$with_llvm_config_path]],
[[LLVM_CONFIG="llvm-config"]]
)
@@ -216,7 +216,7 @@ dnl ************************************
AC_ARG_WITH(clang-path,
[AS_HELP_STRING(--with-clang-path=path,
[clang path (use default path)])],
- [[CLANG_PATH=$withval]],
+ [[CLANG_PATH=$with_clang_path]],
[[CLANG_PATH="$(LLVM_CONFIG) --bindir"]]
)
AC_SUBST([CLANG_PATH])
@@ -227,7 +227,7 @@ dnl ************************************
AC_ARG_WITH(mmtk-plan,
[AS_HELP_STRING(--with-mmtk-plan=something,
[MMTk plan type ('org.mmtk.plan.marksweep.MS')])],
- [[MMTK_PLAN=$withval]],
+ [[MMTK_PLAN=$with_mmtk_plan]],
[[MMTK_PLAN=org.mmtk.plan.marksweep.MS]]
)
@@ -245,14 +245,14 @@ classpathversion=0.97.2;
AC_ARG_WITH(gnu-classpath-libs,
[AS_HELP_STRING(--with-gnu-classpath-libs=something,
[GNU CLASSPATH libraries (default is /usr/lib/classpath)])],
- [[classpathlibs=$withval]],
+ [[classpathlibs=$with_gnu_classpath_libs]],
[[classpathlibs=/usr/lib/classpath]]
)
AC_ARG_WITH(gnu-classpath-glibj,
[AS_HELP_STRING(--with-gnu-classpath-glibj,
[Build J3 with GNU Classpath install (default is '/usr/share/classpath/glibj.zip')])],
- [[classpathglibj=$withval]],
+ [[classpathglibj=$with_gnu_classpath_glibj]],
[[classpathglibj=/usr/share/classpath/glibj.zip]]
)
@@ -267,7 +267,7 @@ dnl ************************************
AC_ARG_WITH(openjdk-path,
[AS_HELP_STRING(--with-openjdk-path,
[Build J3 with OpenJDK JRE install (default is '/usr/lib/java/')])],
- [[openjdkpath=$withval]],
+ [[openjdkpath=$with_openjdk_path]],
[[openjdkpath=/usr/lib/java/]]
)
@@ -281,7 +281,7 @@ dnl ************************************
AC_ARG_WITH(classpath-impl,
[AS_HELP_STRING(--with-classpath-impl,
[Build J3 with the specified classpath implementation (default is gnuclasspath)])],
- [[classpathimpl=$withval]],
+ [[classpathimpl=$with_classpath_impl]],
[[classpathimpl=gnuclasspath]]
)
@@ -318,8 +318,8 @@ dnl ************************************
AC_ARG_ENABLE(incinerator,
AS_HELP_STRING([--enable-incinerator],
[Use incinerator to kill stale references in OSGi (default is NO)]),,
- enableval=no)
-case "$enableval" in
+ enable_incinerator=no)
+case "$enable_incinerator" in
yes) AC_DEFINE(RESET_STALE_REFERENCES,[1]) ;;
no) ;; #AC_DEFINE(RESET_STALE_REFERENCES,[0]) ;;
*) AC_MSG_ERROR([Invalid setting for --enable-incinerator. Use "yes" or "no"]) ;;
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=181302&r1=181301&r2=181302&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Tue May 7 04:52:27 2013
@@ -2494,10 +2494,10 @@ esac
if test "${enable_optimized+set}" = set; then :
enableval=$enable_optimized;
else
- enableval=yes
+ enable_optimized=yes
fi
-case "$enableval" in
+case "$enable_optimized" in
yes) OPTIMIZED=1
;;
no) OPTIMIZED=0
@@ -2509,10 +2509,10 @@ esac
if test "${enable_debug+set}" = set; then :
enableval=$enable_debug;
else
- enableval=no
+ enable_debug=no
fi
-case "$enableval" in
+case "$enable_debug" in
yes) DEBUG=1
;;
no) DEBUG=0
@@ -2524,11 +2524,11 @@ esac
if test "${enable_assert+set}" = set; then :
enableval=$enable_assert;
else
- enableval=yes
+ enable_assert=yes
fi
-case "$enableval" in
+case "$enable_assert" in
yes) ASSERT=1
;;
no) ASSERT=0
@@ -2539,7 +2539,7 @@ esac
# Check whether --with-llvm-config-path was given.
if test "${with_llvm_config_path+set}" = set; then :
- withval=$with_llvm_config_path; LLVM_CONFIG=$withval
+ withval=$with_llvm_config_path; LLVM_CONFIG=$with_llvm_config_path
else
LLVM_CONFIG="llvm-config"
@@ -2549,7 +2549,7 @@ fi
# Check whether --with-clang-path was given.
if test "${with_clang_path+set}" = set; then :
- withval=$with_clang_path; CLANG_PATH=$withval
+ withval=$with_clang_path; CLANG_PATH=$with_clang_path
else
CLANG_PATH="$(LLVM_CONFIG) --bindir"
@@ -2560,7 +2560,7 @@ fi
# Check whether --with-mmtk-plan was given.
if test "${with_mmtk_plan+set}" = set; then :
- withval=$with_mmtk_plan; MMTK_PLAN=$withval
+ withval=$with_mmtk_plan; MMTK_PLAN=$with_mmtk_plan
else
MMTK_PLAN=org.mmtk.plan.marksweep.MS
@@ -2578,7 +2578,7 @@ classpathversion=0.97.2;
# Check whether --with-gnu-classpath-libs was given.
if test "${with_gnu_classpath_libs+set}" = set; then :
- withval=$with_gnu_classpath_libs; classpathlibs=$withval
+ withval=$with_gnu_classpath_libs; classpathlibs=$with_gnu_classpath_libs
else
classpathlibs=/usr/lib/classpath
@@ -2588,7 +2588,7 @@ fi
# Check whether --with-gnu-classpath-glibj was given.
if test "${with_gnu_classpath_glibj+set}" = set; then :
- withval=$with_gnu_classpath_glibj; classpathglibj=$withval
+ withval=$with_gnu_classpath_glibj; classpathglibj=$with_gnu_classpath_glibj
else
classpathglibj=/usr/share/classpath/glibj.zip
@@ -2603,7 +2603,7 @@ fi
# Check whether --with-openjdk-path was given.
if test "${with_openjdk_path+set}" = set; then :
- withval=$with_openjdk_path; openjdkpath=$withval
+ withval=$with_openjdk_path; openjdkpath=$with_openjdk_path
else
openjdkpath=/usr/lib/java/
@@ -2617,7 +2617,7 @@ fi
# Check whether --with-classpath-impl was given.
if test "${with_classpath_impl+set}" = set; then :
- withval=$with_classpath_impl; classpathimpl=$withval
+ withval=$with_classpath_impl; classpathimpl=$with_classpath_impl
else
classpathimpl=gnuclasspath
@@ -2903,10 +2903,10 @@ esac
if test "${enable_incinerator+set}" = set; then :
enableval=$enable_incinerator;
else
- enableval=no
+ enable_incinerator=no
fi
-case "$enableval" in
+case "$enable_incinerator" in
yes) $as_echo "#define RESET_STALE_REFERENCES 1" >>confdefs.h
;;
no) ;; #AC_DEFINE(RESET_STALE_REFERENCES,[0]) ;;
From sylvestre at debian.org Tue May 7 03:15:34 2013
From: sylvestre at debian.org (Sylvestre Ledru)
Date: Tue, 07 May 2013 10:15:34 -0000
Subject: [vmkit-commits] [vmkit] r181304 - Fail the configure when
llvm-config or clang has been set but cannot be found
Message-ID: <20130507101520.6F06E2A6C029@llvm.org>
Author: sylvestre
Date: Tue May 7 05:15:20 2013
New Revision: 181304
URL: http://llvm.org/viewvc/llvm-project?rev=181304&view=rev
Log:
Fail the configure when llvm-config or clang has been set but cannot be found
Modified:
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=181304&r1=181303&r2=181304&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Tue May 7 05:15:20 2013
@@ -210,6 +210,10 @@ AC_ARG_WITH(llvm-config-path,
[[LLVM_CONFIG="llvm-config"]]
)
+if test ! -x "$LLVM_CONFIG"; then
+ AC_MSG_ERROR([Cannot find $LLVM_CONFIG (or not executable)])
+fi
+
dnl **************************************************************************
dnl clang
dnl **************************************************************************
@@ -219,10 +223,15 @@ AC_ARG_WITH(clang-path,
[[CLANG_PATH=$with_clang_path]],
[[CLANG_PATH="$(LLVM_CONFIG) --bindir"]]
)
+
+if test ! -x "$CLANG_PATH"; then
+ AC_MSG_ERROR([Cannot find $CLANG_PATH (or not executable)])
+fi
+
AC_SUBST([CLANG_PATH])
dnl **************************************************************************
-dnl GC type
+dnl GC type
dnl **************************************************************************
AC_ARG_WITH(mmtk-plan,
[AS_HELP_STRING(--with-mmtk-plan=something,
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=181304&r1=181303&r2=181304&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Tue May 7 05:15:20 2013
@@ -2546,6 +2546,10 @@ else
fi
+if test ! -x "$LLVM_CONFIG"; then
+ as_fn_error $? "Cannot find $LLVM_CONFIG (or not executable)" "$LINENO" 5
+fi
+
# Check whether --with-clang-path was given.
if test "${with_clang_path+set}" = set; then :
@@ -2556,6 +2560,11 @@ else
fi
+if test ! -x "$CLANG_PATH"; then
+ as_fn_error $? "Cannot find $CLANG_PATH (or not executable)" "$LINENO" 5
+fi
+
+
# Check whether --with-mmtk-plan was given.
From peter.senna at gmail.com Tue May 7 07:09:21 2013
From: peter.senna at gmail.com (Peter Senna Tschudin)
Date: Tue, 07 May 2013 14:09:21 -0000
Subject: [vmkit-commits] [vmkit] r181314 - updated website
Message-ID: <20130507140902.6B3E12A6C029@llvm.org>
Author: peter.senna
Date: Tue May 7 09:08:58 2013
New Revision: 181314
URL: http://llvm.org/viewvc/llvm-project?rev=181314&view=rev
Log:
updated website
Added:
vmkit/trunk/www/lip6.png
vmkit/trunk/www/tuto/
vmkit/trunk/www/tuto/VMKit_pres_eng.pdf
vmkit/trunk/www/tuto/VMKit_pres_fr.pdf
vmkit/trunk/www/tuto/VMKit_tutorial.pdf
vmkit/trunk/www/tuto/VMKit_tutorial.tar.gz
vmkit/trunk/www/tuto/VMKit_tutorial_eng.pdf
vmkit/trunk/www/tuto/toy-vm-base.tar.gz
vmkit/trunk/www/tutorial.html
Modified:
vmkit/trunk/www/get_started.html
vmkit/trunk/www/index.html
vmkit/trunk/www/menu.html.incl
Modified: vmkit/trunk/www/get_started.html
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/get_started.html?rev=181314&r1=181313&r2=181314&view=diff
==============================================================================
--- vmkit/trunk/www/get_started.html (original)
+++ vmkit/trunk/www/get_started.html Tue May 7 09:08:58 2013
@@ -21,52 +21,48 @@ options. This should get you up and run
If you like what you see, please consider getting
involved with the vmkit community.
-
-A word of warning
-
-While this work aims to provide a fully functional JVM, it
-is still early work and is under heavy development.
-
Some of the common missing pieces in vmkit/llvm are:
-
-
- - Mixed interpretation/compilation.
- - Adaptive optimization.
-
-
Building vmkit / working with the code
If you would like to check out and build the project, the current scheme
is:
+Prerequisites
+You will have to install a C++ compiler and Java 1.5 or more in order to
+compile vmkit2
+
- - Checkout
- LLVM and
- Clang from SVN head.
+
- Download
+ LLVM 3.2 and
+ Clang 3.2
+ source code.
- - svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm
- - cd llvm/tools
- - svn co http://llvm.org/svn/llvm-project/cfe/trunk clang
- - cd ..
- - ./configure; make ENABLE_OPTIMIZED=1
-
-
-
- - Download
- GNU Classpath 0.97.2:
-
-
- - tar zxvf classpath-0.97.2.tar.gz
- - cd classpath-0.97.2
- - ./configure --disable-plugin --disable-examples --disable-Werror; make
+ - tar zxvf llvm-3.2.src.tar.gz
+ - cd llvm-3.2.src/tools
+ - tar zxvf ../../clang-3.2.src.tar.gz
+ - mv clang-3.2.src clang
+ - cd ..
+ - ./configure --enable-optimized; make
+
+
+ Skip the Classpath steps if you plan to use OpenJDK instead.
+
- Download
+ GNU Classpath 0.99:
+
+
+ - tar zxvf classpath-0.99.tar.gz
+ - cd classpath-0.99
+ - ./configure --disable-plugin --disable-examples --disable-Werror;
+ make
- cd lib
- If you are running on Linux:
- ln -s ../native/jni/gtk-peer/.libs/libgtkpeer.so;
- ln -s ../native/jni/gconf-peer/.libs/libgconfpeer.so;
- ln -s ../native/jni/java-io/.libs/libjavaio.so;
- - ln -s ../native/jni/java-lang/.libs/libjavalangreflect.so;
+ - ln -s ../native/jni/java-lang/.libs/libjavalangreflect.so;
+
- ln -s ../native/jni/java-lang/.libs/libjavalang.so;
- ln -s ../native/jni/java-net/.libs/libjavanet.so;
- ln -s ../native/jni/java-nio/.libs/libjavanio.so;
@@ -77,7 +73,8 @@ is:
- ln -s ../native/jni/gtk-peer/.libs/libgtkpeer.dylib;
- ln -s ../native/jni/gconf-peer/.libs/libgconfpeer.dylib;
- ln -s ../native/jni/java-io/.libs/libjavaio.dylib;
- - ln -s ../native/jni/java-lang/.libs/libjavalangreflect.dylib;
+ - ln -s ../native/jni/java-lang/.libs/libjavalangreflect.dylib;
+
- ln -s ../native/jni/java-lang/.libs/libjavalang.dylib;
- ln -s ../native/jni/java-net/.libs/libjavanet.dylib;
- ln -s ../native/jni/java-nio/.libs/libjavanio.dylib;
@@ -87,41 +84,59 @@ is:
- Checkout vmkit:
- - svn co http://llvm.org/svn/llvm-project/vmkit/trunk vmkit
-
+ - svn co http://llvm.org/svn/llvm-project/vmkit/trunk vmkit
+
- Configure vmkit:
- - ./configure
-
- - --with-llvmsrc=<directory>
- - Tell vmkit where the LLVM source tree is located.
-
--with-llvmobj=<directory>
- - Tell vmkit where the LLVM object tree is located.
-
--with-gnu-classpath-glibj=<file or directory>
- - Tell vmkit where GNU Classpath glibj.zip is located.
-
--with-gnu-classpath-libs=<directory>
- - Tell vmkit where GNU Classpath libs are located.
-
--with-mmtk-plan=
+
- ./configure
+
+ - --with-llvm-config-path=<path/to/llvm-config>
+ - Tell vmkit where the llvm-config binary is located.
+
--with-mmtk-plan=
-
+
+ - org.mmtk.plan.marksweep.MS (default)
+ - org.mmtk.plan.copyms.CopyMS
+ - org.mmtk.plan.semispace.SS
+ - org.mmtk.plan.immix.Immix
+ - org.mmtk.plan.generational.marksweep.GenMS
+ - org.mmtk.plan.generational.copying.GenCopy
+ - org.mmtk.plan.generational.immix.GenImmix
+
+
-
-
-
+
- Build vmkit:
- - cd vmkit
- - make ENABLE_OPTIMIZED=1 (this will give you a release build)
+ - make (this will give you a release build)
- Try it out: (assuming vmkit/Release+Asserts/bin is in your path)
@@ -130,7 +145,6 @@ is:
- j3 HelloWorld
-