Changes in directory llvm:
Makefile updated: 1.66 -> 1.67
Makefile.config.in updated: 1.67 -> 1.68
Makefile.rules updated: 1.411 -> 1.412
configure updated: 1.256 -> 1.257
---
Log message:
Undo removal of the runtime libraries. While this may have been a bit
premature, these libraries will be going away for the 2.0 release. Other
arrangements for profiling, gc, etc. should be made in the next few months.
---
Diffs of the changes: (+80 -34)
Makefile | 13 +++++--
Makefile.config.in | 5 +++
Makefile.rules | 8 ++++
configure | 88 ++++++++++++++++++++++++++++++++++-------------------
4 files changed, 80 insertions(+), 34 deletions(-)
Index: llvm/Makefile
diff -u llvm/Makefile:1.66 llvm/Makefile:1.67
--- llvm/Makefile:1.66 Thu Nov 16 17:17:26 2006
+++ llvm/Makefile Thu Nov 16 21:32:33 2006
@@ -15,23 +15,28 @@
# 3. Build VMCore, which builds the Intrinsics.inc file used by libs.
# 4. Build libs, which are needed by llvm-config.
# 5. Build llvm-config, which determines inter-lib dependencies for tools.
-# 6. Build tools, docs.
+# 6. Build tools, runtime, docs.
#
DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
- tools docs
+ tools runtime docs
OPTIONAL_DIRS := examples projects
EXTRA_DIST := test llvm.spec include win32 Xcode
include $(LEVEL)/Makefile.config
+# llvm-gcc4 doesn't need runtime libs.
+ifeq ($(LLVMGCC_MAJVERS),4)
+ DIRS := $(filter-out runtime, $(DIRS))
+endif
+
ifeq ($(MAKECMDGOALS),libs-only)
- DIRS := $(filter-out tools docs, $(DIRS))
+ DIRS := $(filter-out tools runtime docs, $(DIRS))
OPTIONAL_DIRS :=
endif
ifeq ($(MAKECMDGOALS),tools-only)
- DIRS := $(filter-out docs, $(DIRS))
+ DIRS := $(filter-out runtime docs, $(DIRS))
OPTIONAL_DIRS :=
endif
Index: llvm/Makefile.config.in
diff -u llvm/Makefile.config.in:1.67 llvm/Makefile.config.in:1.68
--- llvm/Makefile.config.in:1.67 Thu Nov 16 17:17:26 2006
+++ llvm/Makefile.config.in Thu Nov 16 21:32:33 2006
@@ -207,6 +207,11 @@
#DISABLE_ASSERTIONS = 1
@DISABLE_ASSERTIONS@
+# When DEBUG_RUNTIME is enabled, the runtime libraries will retain debug
+# symbols.
+#DEBUG_RUNTIME = 1
[EMAIL PROTECTED]@
+
# When ENABLE_PROFILING is enabled, the llvm source base is built with profile
# information to allow gprof to be used to get execution frequencies.
#ENABLE_PROFILING = 1
Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.411 llvm/Makefile.rules:1.412
--- llvm/Makefile.rules:1.411 Thu Nov 16 17:17:26 2006
+++ llvm/Makefile.rules Thu Nov 16 21:32:33 2006
@@ -1099,10 +1099,18 @@
$(Echo) "Compiling $*.c to asm for $(BuildMode) build" $(PIC_FLAG)
$(MAYBE_PIC_Compile.C) $< -o $@ -S
+
# make the C and C++ compilers strip debug info out of bytecode libraries.
+ifdef DEBUG_RUNTIME
+$(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(GCCAS)
+ $(Echo) "Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)"
+ $(Verb) $(GCCAS) $< -o $@
+else
$(ObjectsBC): $(ObjDir)/%.bc: $(ObjDir)/%.ll $(GCCAS)
$(Echo) "Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)"
$(Verb) $(GCCAS) -strip-debug $< -o $@
+endif
+
#---------------------------------------------------------
# Provide rule to build .bc files from .ll sources,
Index: llvm/configure
diff -u llvm/configure:1.256 llvm/configure:1.257
--- llvm/configure:1.256 Thu Nov 16 17:17:26 2006
+++ llvm/configure Thu Nov 16 21:32:33 2006
@@ -830,6 +830,7 @@
CVSBUILD
ENABLE_OPTIMIZED
DISABLE_ASSERTIONS
+DEBUG_RUNTIME
JIT
TARGET_HAS_JIT
ENABLE_DOXYGEN
@@ -1519,6 +1520,7 @@
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-optimized
--enable-assertions
+ --enable-debug-runtime
--enable-jit Enable Just In Time Compiling (default is YES)
--enable-doxygen Build doxygen documentation (default is NO)
--enable-threads Use threads if available (default is YES)
@@ -4561,6 +4563,21 @@
fi
+# Check whether --enable-debug-runtime was given.
+if test "${enable_debug_runtime+set}" = set; then
+ enableval=$enable_debug_runtime;
+else
+ enableval=no
+fi
+
+if test ${enableval} = "no" ; then
+ DEBUG_RUNTIME=
+
+else
+ DEBUG_RUNTIME=DEBUG_RUNTIME=1
+
+fi
+
# Check whether --enable-jit was given.
if test "${enable_jit+set}" = set; then
enableval=$enable_jit;
@@ -10281,7 +10298,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10284 "configure"
+#line 10301 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12425,7 +12442,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 12428 "configure"' > conftest.$ac_ext
+ echo '#line 12445 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14143,11 +14160,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14146: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14163: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14150: \$? = $ac_status" >&5
+ echo "$as_me:14167: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14411,11 +14428,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14414: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14431: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14418: \$? = $ac_status" >&5
+ echo "$as_me:14435: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14515,11 +14532,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14518: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14535: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14522: \$? = $ac_status" >&5
+ echo "$as_me:14539: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16967,7 +16984,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 16970 "configure"
+#line 16987 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17067,7 +17084,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17070 "configure"
+#line 17087 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19435,11 +19452,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19438: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19455: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19442: \$? = $ac_status" >&5
+ echo "$as_me:19459: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -19539,11 +19556,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19542: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19559: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19546: \$? = $ac_status" >&5
+ echo "$as_me:19563: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21109,11 +21126,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21112: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21129: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:21116: \$? = $ac_status" >&5
+ echo "$as_me:21133: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -21213,11 +21230,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21216: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21233: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:21220: \$? = $ac_status" >&5
+ echo "$as_me:21237: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -23448,11 +23465,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:23451: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:23468: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:23455: \$? = $ac_status" >&5
+ echo "$as_me:23472: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -23716,11 +23733,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:23719: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:23736: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:23723: \$? = $ac_status" >&5
+ echo "$as_me:23740: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -23820,11 +23837,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:23823: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:23840: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:23827: \$? = $ac_status" >&5
+ echo "$as_me:23844: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -33414,6 +33431,9 @@
ac_config_commands="$ac_config_commands lib/Makefile"
+ac_config_commands="$ac_config_commands runtime/Makefile"
+
+
ac_config_commands="$ac_config_commands test/Makefile"
@@ -34007,6 +34027,7 @@
"Makefile.common") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;;
"examples/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS examples/Makefile"
;;
"lib/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS lib/Makefile" ;;
+ "runtime/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS runtime/Makefile" ;;
"test/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS test/Makefile" ;;
"test/Makefile.tests") CONFIG_COMMANDS="$CONFIG_COMMANDS
test/Makefile.tests" ;;
"tools/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS tools/Makefile" ;;
@@ -34148,6 +34169,7 @@
CVSBUILD!$CVSBUILD$ac_delim
ENABLE_OPTIMIZED!$ENABLE_OPTIMIZED$ac_delim
DISABLE_ASSERTIONS!$DISABLE_ASSERTIONS$ac_delim
+DEBUG_RUNTIME!$DEBUG_RUNTIME$ac_delim
JIT!$JIT$ac_delim
TARGET_HAS_JIT!$TARGET_HAS_JIT$ac_delim
ENABLE_DOXYGEN!$ENABLE_DOXYGEN$ac_delim
@@ -34170,7 +34192,6 @@
LN_S!$LN_S$ac_delim
CMP!$CMP$ac_delim
CP!$CP$ac_delim
-DATE!$DATE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -34212,6 +34233,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+DATE!$DATE$ac_delim
FIND!$FIND$ac_delim
MKDIR!$MKDIR$ac_delim
MV!$MV$ac_delim
@@ -34277,7 +34299,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -34688,6 +34710,8 @@
${SHELL} ${llvm_src}/autoconf/install-sh -c ${srcdir}/examples/Makefile
examples/Makefile ;;
"lib/Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname lib/Makefile`
${SHELL} ${llvm_src}/autoconf/install-sh -c ${srcdir}/lib/Makefile
lib/Makefile ;;
+ "runtime/Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname
runtime/Makefile`
+ ${SHELL} ${llvm_src}/autoconf/install-sh -c ${srcdir}/runtime/Makefile
runtime/Makefile ;;
"test/Makefile":C) ${llvm_src}/autoconf/mkinstalldirs `dirname
test/Makefile`
${SHELL} ${llvm_src}/autoconf/install-sh -c ${srcdir}/test/Makefile
test/Makefile ;;
"test/Makefile.tests":C) ${llvm_src}/autoconf/mkinstalldirs `dirname
test/Makefile.tests`
@@ -34909,8 +34933,12 @@
if test "$llvm_cv_llvmgcc_sanity" = "no" ; then
{ echo "$as_me:$LINENO: WARNING: ***** llvm-gcc/llvm-g++ was not found, or
does not appear to be " >&5
echo "$as_me: WARNING: ***** llvm-gcc/llvm-g++ was not found, or does not
appear to be " >&2;}
- { echo "$as_me:$LINENO: WARNING: ***** working. Please make sure you have
llvm-gcc and llvm-g++ " >&5
-echo "$as_me: WARNING: ***** working. Please make sure you have llvm-gcc and
llvm-g++ " >&2;}
- { echo "$as_me:$LINENO: WARNING: ***** in your path before configuring LLVM."
>&5
-echo "$as_me: WARNING: ***** in your path before configuring LLVM." >&2;}
+ { echo "$as_me:$LINENO: WARNING: ***** working. Please make sure you have
llvm-gcc and llvm-g++ in" >&5
+echo "$as_me: WARNING: ***** working. Please make sure you have llvm-gcc and
llvm-g++ in" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ***** your path before configuring LLVM. The
runtime libraries" >&5
+echo "$as_me: WARNING: ***** your path before configuring LLVM. The runtime
libraries" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ***** (llvm/runtime) will not be built but
you should be able to" >&5
+echo "$as_me: WARNING: ***** (llvm/runtime) will not be built but you should
be able to" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ***** build the llvm tools." >&5
+echo "$as_me: WARNING: ***** build the llvm tools." >&2;}
fi
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
