[llvm-commits] CVS: llvm-test/Makefile.rules
Changes in directory llvm-test:
Makefile.rules updated: 1.9 -> 1.10
---
Log message:
Make sure the CONFIGURATION variable is set correctly in light of changes
in LLVM's Makefile.rules. Basically when Assertion checking is on, it
needs to be set to Release+Asserts, or when off to Debug-Asserts, as is the
case for LLVM.
---
Diffs of the changes: (+13 -0)
Makefile.rules | 13 +
1 files changed, 13 insertions(+)
Index: llvm-test/Makefile.rules
diff -u llvm-test/Makefile.rules:1.9 llvm-test/Makefile.rules:1.10
--- llvm-test/Makefile.rules:1.9Tue Feb 28 12:22:24 2006
+++ llvm-test/Makefile.rulesSun Apr 9 02:18:00 2006
@@ -104,6 +104,7 @@
@${ECHO} "Build Object Dir : " $(PROJ_OBJ_DIR)
@${ECHO} "LLVM Source Root: " $(LLVM_SRC_ROOT)
@${ECHO} "LLVM Object Root: " $(LLVM_OBJ_ROOT)
+ @${ECHO} "CONFIGURATION: " $(CONFIGURATION)
###
# Suffixes and implicit rules:
@@ -147,6 +148,18 @@
endif
endif
+# If ENABLE_ASSERTIONS=1 is specified (make command line or configured),
+# then adjust the CONFIGURATION name appropriately (to match LLVM makefiles)
+ifdef ENABLE_ASSERTIONS
+ ifdef ENABLE_OPTIMIZED
+ CONFIGURATION := $(CONFIGURATION)+Asserts
+ endif
+else
+ ifndef ENABLE_OPTIMIZED
+ CONFIGURATION := $(CONFIGURATION)-Asserts
+ endif
+endif
+
#
# Enable this for profiling support with 'gprof'
# This automatically enables optimized builds.
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm-test/SingleSource/UnitTests/Makefile
Changes in directory llvm-test/SingleSource/UnitTests: Makefile updated: 1.6 -> 1.7 --- Log message: Don't run vector tests if we just have llvmgcc3 --- Diffs of the changes: (+9 -2) Makefile | 11 +-- 1 files changed, 9 insertions(+), 2 deletions(-) Index: llvm-test/SingleSource/UnitTests/Makefile diff -u llvm-test/SingleSource/UnitTests/Makefile:1.6 llvm-test/SingleSource/UnitTests/Makefile:1.7 --- llvm-test/SingleSource/UnitTests/Makefile:1.6 Wed Mar 22 00:14:10 2006 +++ llvm-test/SingleSource/UnitTests/Makefile Sun Apr 9 02:18:21 2006 @@ -1,6 +1,13 @@ # SingleSource/UnitTests/Makefile - -DIRS = Vector SetjmpLongjmp LEVEL = ../.. +include $(LEVEL)/Makefile.config + +DIRS := SetjmpLongjmp + +# llvm-gcc3 does not support any vector tests. +ifneq ($(LLVMGCC_MAJVERS),3) +DIRS += Vector +endif + include $(LEVEL)/SingleSource/Makefile.singlesrc ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/autoconf/configure.ac
Changes in directory llvm/autoconf:
configure.ac updated: 1.216 -> 1.217
---
Log message:
Change the assertions defaults:
1. Assertions now default to on for all builds
2. If you want them disabled you must (a) --disable-assertions to configure
or DISABLE_ASSERTIONS=1 to make.
---
Diffs of the changes: (+4 -6)
configure.ac | 10 --
1 files changed, 4 insertions(+), 6 deletions(-)
Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.216 llvm/autoconf/configure.ac:1.217
--- llvm/autoconf/configure.ac:1.216Fri Apr 7 20:41:26 2006
+++ llvm/autoconf/configure.ac Sun Apr 9 15:42:14 2006
@@ -193,12 +193,10 @@
if test -d "CVS" -o -d "${srcdir}/CVS"; then
cvsbuild="yes"
optimize="no"
- asserts="yes"
AC_SUBST(CVSBUILD,[[CVSBUILD=1]])
else
cvsbuild="no"
optimize="yes"
- asserts="no"
fi
dnl===---===
@@ -218,11 +216,11 @@
dnl --enable-assertions : check whether they want to turn on assertions or not:
AC_ARG_ENABLE(assertions,AS_HELP_STRING(
- [--enable-assertions,Compile with assertion checks enabled (default is
NO)]),, enableval=$asserts)
-if test ${enableval} = "no" ; then
- AC_SUBST(ENABLE_ASSERTIONS,[[]])
+ [--enable-assertions,Compile with assertion checks enabled (default is
YES)]),, enableval="yes")
+if test ${enableval} = "yes" ; then
+ AC_SUBST(DISABLE_ASSERTIONS,[[]])
else
- AC_SUBST(ENABLE_ASSERTIONS,[[ENABLE_ASSERTIONS=1]])
+ AC_SUBST(DISABLE_ASSERTIONS,[[DISABLE_ASSERTIONS=1]])
fi
dnl --enable-debug-runtime : should runtime libraries have debug symbols?
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/configure Makefile.config.in
Changes in directory llvm:
configure updated: 1.218 -> 1.219
Makefile.config.in updated: 1.55 -> 1.56
---
Log message:
Change the assertions defaults:
1. Assertions now default to on for all builds
2. If you want them disabled you must (a) --disable-assertions to configure
or DISABLE_ASSERTIONS=1 to make.
---
Diffs of the changes: (+37 -39)
Makefile.config.in |4 +-
configure | 72 +
2 files changed, 37 insertions(+), 39 deletions(-)
Index: llvm/configure
diff -u llvm/configure:1.218 llvm/configure:1.219
--- llvm/configure:1.218Fri Apr 7 20:41:26 2006
+++ llvm/configure Sun Apr 9 15:42:14 2006
@@ -476,7 +476,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
LLVM_COPYRIGHT subdirs build build_cpu build_vendor build_os host host_cpu
host_vendor host_os target target_cpu target_vendor target_os OS LLVM_ON_UNIX
LLVM_ON_WIN32 ARCH ENDIAN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT
CVSBUILD ENABLE_OPTIMIZED ENABLE_ASSERTIONS DEBUG_RUNTIME JIT TARGET_HAS_JIT
ENABLE_DOXYGEN ENABLE_THREADS TARGETS_TO_BUILD CPP CXX CXXFLAGS ac_ct_CXX LEX
LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON ifGNUmake LN_S CMP CP DATE FIND GREP
MKDIR MV RANLIB ac_ct_RANLIB RM SED TAR GRAPHVIZ GV PERL HAVE_PERL
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA BZIP2 DOT DOXYGEN ETAGS GROFF GZIP
POD2HTML POD2MAN RUNTEST TCLSH ZIP EGR!
EP INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE
CONVENIENCE_LTDL_FALSE LIBADD_DL ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXXCPP F77
FFLAGS ac_ct_F77 LIBTOOL ETAGSFLAGS LLVMGCC LLVMGXX ALLOCA MMAP_FILE LLVMCC1
LLVMCC1PLUS LLVMGCCDIR LLVMGCC_VERSION LLVMGCC_MAJVERS SHLIBEXT LLVM_PREFIX
LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR
LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
LLVM_COPYRIGHT subdirs build build_cpu build_vendor build_os host host_cpu
host_vendor host_os target target_cpu target_vendor target_os OS LLVM_ON_UNIX
LLVM_ON_WIN32 ARCH ENDIAN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT
CVSBUILD ENABLE_OPTIMIZED DISABLE_ASSERTIONS DEBUG_RUNTIME JIT TARGET_HAS_JIT
ENABLE_DOXYGEN ENABLE_THREADS TARGETS_TO_BUILD CPP CXX CXXFLAGS ac_ct_CXX LEX
LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON ifGNUmake LN_S CMP CP DATE FIND GREP
MKDIR MV RANLIB ac_ct_RANLIB RM SED TAR GRAPHVIZ GV PERL HAVE_PERL
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA BZIP2 DOT DOXYGEN ETAGS GROFF GZIP
POD2HTML POD2MAN RUNTEST TCLSH ZIP EG!
REP INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE
CONVENIENCE_LTDL_FALSE LIBADD_DL ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXXCPP F77
FFLAGS ac_ct_F77 LIBTOOL ETAGSFLAGS LLVMGCC LLVMGXX ALLOCA MMAP_FILE LLVMCC1
LLVMCC1PLUS LLVMGCCDIR LLVMGCC_VERSION LLVMGCC_MAJVERS SHLIBEXT LLVM_PREFIX
LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR
LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -2971,13 +2971,11 @@
if test -d "CVS" -o -d "${srcdir}/CVS"; then
cvsbuild="yes"
optimize="no"
- asserts="yes"
CVSBUILD=CVSBUILD=1
else
cvsbuild="no"
optimize="yes"
- asserts="no"
fi
@@ -3001,13 +2999,13 @@
enableval="$enable_assertions"
else
- enableval=$asserts
+ enableval="yes"
fi;
-if test ${enableval} = "no" ; then
- ENABLE_ASSERTIONS=
+if test ${enableval} = "yes" ; then
+ DISABLE_ASSERTIONS=
else
- ENABLE_ASSERTIONS=ENABLE_ASSERTIONS=1
+ DISABLE_ASSERTIONS=DISABLE_ASSERTIONS=1
fi
@@ -8467,7 +8465,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext
+ echo '#line 10459 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10943,7 +10941,7 @@
# Provide some information about the compiler.
-echo "$as_me:10946:" \
+echo "$as_me:10944:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -12000,11 +11998,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo
[llvm-commits] CVS: llvm-test/Makefile.rules
Changes in directory llvm-test: Makefile.rules updated: 1.10 -> 1.11 --- Log message: Adjust to reversed logic in LLVM's Makefile.rules. We now use the make variable DISABLE_ASSERTIONS instead of ENABLE_ASSERTIONS. --- Diffs of the changes: (+1 -7) Makefile.rules |8 +--- 1 files changed, 1 insertion(+), 7 deletions(-) Index: llvm-test/Makefile.rules diff -u llvm-test/Makefile.rules:1.10 llvm-test/Makefile.rules:1.11 --- llvm-test/Makefile.rules:1.10 Sun Apr 9 02:18:00 2006 +++ llvm-test/Makefile.rulesSun Apr 9 15:43:17 2006 @@ -150,14 +150,8 @@ # If ENABLE_ASSERTIONS=1 is specified (make command line or configured), # then adjust the CONFIGURATION name appropriately (to match LLVM makefiles) -ifdef ENABLE_ASSERTIONS - ifdef ENABLE_OPTIMIZED - CONFIGURATION := $(CONFIGURATION)+Asserts - endif -else - ifndef ENABLE_OPTIMIZED +ifdef DISABLE_ASSERTIONS CONFIGURATION := $(CONFIGURATION)-Asserts - endif endif # ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/Makefile.config.in
Changes in directory llvm: Makefile.config.in updated: 1.56 -> 1.57 --- Log message: Fix a comment. --- Diffs of the changes: (+2 -2) Makefile.config.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: llvm/Makefile.config.in diff -u llvm/Makefile.config.in:1.56 llvm/Makefile.config.in:1.57 --- llvm/Makefile.config.in:1.56Sun Apr 9 15:42:14 2006 +++ llvm/Makefile.config.in Sun Apr 9 18:39:43 2006 @@ -184,8 +184,8 @@ #ENABLE_OPTIMIZED = 1 @ENABLE_OPTIMIZED@ -# When ENABLE_ASSERTIONS is enabled, builds of all of the LLVM code will include -# assertion checks, otherwise they are not included. +# When DISABLE_ASSERTIONS is enabled, builds of all of the LLVM code will +# exclude assertion checks, otherwise they are included. #DISABLE_ASSERTIONS = 1 @DISABLE_ASSERTIONS@ ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/Makefile.rules
Changes in directory llvm: Makefile.rules updated: 1.358 -> 1.359 --- Log message: Check for DISABLE_ASSERTIONS, not ENABLE_ASSERTIONS --- Diffs of the changes: (+5 -9) Makefile.rules | 14 +- 1 files changed, 5 insertions(+), 9 deletions(-) Index: llvm/Makefile.rules diff -u llvm/Makefile.rules:1.358 llvm/Makefile.rules:1.359 --- llvm/Makefile.rules:1.358 Fri Apr 7 11:06:18 2006 +++ llvm/Makefile.rules Sun Apr 9 18:41:14 2006 @@ -224,18 +224,13 @@ # If ENABLE_ASSERTIONS=1 is specified (make command line or configured), # then enable assertions by defining the appropriate preprocessor symbols. -ifdef ENABLE_ASSERTIONS - ifdef ENABLE_OPTIMIZED - BuildMode := $(BuildMode)+Asserts - endif - CXX.Flags += -D_DEBUG - C.Flags += -D_DEBUG -else - ifndef ENABLE_OPTIMIZED +ifdef DISABLE_ASSERTIONS BuildMode := $(BuildMode)-Asserts - endif CXX.Flags += -DNDEBUG C.Flags += -DNDEBUG +else + CXX.Flags += -D_DEBUG + C.Flags += -D_DEBUG endif CXX.Flags += $(CXXFLAGS) @@ -1699,3 +1694,4 @@ $(Echo) "LexFiles : " '$(LexFiles)' $(Echo) "Module : " '$(Module)' $(Echo) "FilesToConfig: " '$(FilesToConfigPATH)' + $(Echo) "SubDirs : " '$(SubDirs)' ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/docs/GettingStarted.html MakefileGuide.html
Changes in directory llvm/docs: GettingStarted.html updated: 1.127 -> 1.128 MakefileGuide.html updated: 1.30 -> 1.31 --- Log message: Update docs for ENABLE_ASSERTIONS -> DISABLE_ASSERTIONS --- Diffs of the changes: (+9 -8) GettingStarted.html |6 +++--- MakefileGuide.html | 11 ++- 2 files changed, 9 insertions(+), 8 deletions(-) Index: llvm/docs/GettingStarted.html diff -u llvm/docs/GettingStarted.html:1.127 llvm/docs/GettingStarted.html:1.128 --- llvm/docs/GettingStarted.html:1.127 Mon Mar 20 19:10:57 2006 +++ llvm/docs/GettingStarted.html Sun Apr 9 18:45:37 2006 @@ -955,9 +955,9 @@ Perform a Release (Optimized) build. - gmake ENABLE_OPTIMIZED=1 ENABLE_ASSERTIONS=1 + gmake ENABLE_OPTIMIZED=1 DISABLE_ASSERTIONS=1 - Perform a Release (Optimized) build with assertions enabled. + Perform a Release (Optimized) build without assertions enabled. gmake ENABLE_PROFILING=1 @@ -1551,7 +1551,7 @@ mailto:[EMAIL PROTECTED]">Chris Lattner http://llvm.x10sys.com/rspencer/";>Reid Spencer http://llvm.org";>The LLVM Compiler Infrastructure - Last modified: $Date: 2006/03/21 01:10:57 $ + Last modified: $Date: 2006/04/09 23:45:37 $ Index: llvm/docs/MakefileGuide.html diff -u llvm/docs/MakefileGuide.html:1.30 llvm/docs/MakefileGuide.html:1.31 --- llvm/docs/MakefileGuide.html:1.30 Thu Mar 23 00:19:04 2006 +++ llvm/docs/MakefileGuide.htmlSun Apr 9 18:45:38 2006 @@ -632,10 +632,11 @@ to the compilers and linkers to ensure that profile data can be collected from the tools built. Use the gprof tool to analyze the output from the profiled tools (gmon.out). -ENABLE_ASSERTIONS -If set to any value, causes the build to enable assertions, even if -building a release or profile build. This is slower than a release build -but far faster than a debug build. +DISABLE_ASSERTIONS +If set to any value, causes the build to disable assertions, even if +building a release or profile build. This will exclude all assertion check +code from the build. LLVM will execute faster, but with little help when +things go wrong. EXPERIMENTAL_DIRS Specify a set of directories that should be built, but if they fail, it should not cause the build to fail. Note that this should only be used @@ -999,7 +1000,7 @@ mailto:[EMAIL PROTECTED]">Reid Spencer http://llvm.org";>The LLVM Compiler Infrastructure - Last modified: $Date: 2006/03/23 06:19:04 $ + Last modified: $Date: 2006/04/09 23:45:38 $ ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
