[llvm-commits] [llvm-gcc-4.2] r107689 - in /llvm-gcc-4.2/trunk/gcc: configure configure.ac

[Duncan Sands]

Author: baldrick
Date: Tue Jul  6 14:31:25 2010
New Revision: 107689

URL: http://llvm.org/viewvc/llvm-project?rev=107689&view=rev
Log:
Recognize Release+Asserts and Debug+Asserts as valid build types.  This is in
preparation for an upcoming change which makes Release mean optimized without
assertions; optimized with assertions will become Release+Asserts.

Modified:
    llvm-gcc-4.2/trunk/gcc/configure
    llvm-gcc-4.2/trunk/gcc/configure.ac

Modified: llvm-gcc-4.2/trunk/gcc/configure
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/configure?rev=107689&r1=107688&r2=107689&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure (original)
+++ llvm-gcc-4.2/trunk/gcc/configure Tue Jul  6 14:31:25 2010
@@ -8931,6 +8931,12 @@
  elif test -x "$LLVMBASEPATH/Debug-Asserts/bin/llc$EXEEXT"; then
      echo Found Debug-Asserts LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Debug-Asserts"
+ elif test -x "$LLVMBASEPATH/Release+Asserts/bin/llc$EXEEXT"; then
+     echo Found Release+Asserts LLVM Tree in $LLVMBASEPATH
+     LLVMBUILDMODE="Release+Asserts"
+ elif test -x "$LLVMBASEPATH/Debug+Asserts/bin/llc$EXEEXT"; then
+     echo Found Debug+Asserts LLVM Tree in $LLVMBASEPATH
+     LLVMBUILDMODE="Debug+Asserts"
  elif test -x "$LLVMBASEPATH/Release+Checks/bin/llc$EXEEXT"; then
      echo Found Release+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Release+Checks"
@@ -8943,6 +8949,12 @@
  elif test -x "$LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT"; then
      echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Debug-Asserts+Checks"
+ elif test -x "$LLVMBASEPATH/Release+Asserts+Checks/bin/llc$EXEEXT"; then
+     echo Found Release+Asserts+Checks LLVM Tree in $LLVMBASEPATH
+     LLVMBUILDMODE="Release+Asserts+Checks"
+ elif test -x "$LLVMBASEPATH/Debug+Asserts+Checks/bin/llc$EXEEXT"; then
+     echo Found Debug+Asserts+Checks LLVM Tree in $LLVMBASEPATH
+     LLVMBUILDMODE="Debug+Asserts+Checks"
  elif test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
      echo Found Installed LLVM Tree in $LLVMBASEPATH
  elif test x$LLVMBUILDMODE = x; then

Modified: llvm-gcc-4.2/trunk/gcc/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/configure.ac?rev=107689&r1=107688&r2=107689&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure.ac (original)
+++ llvm-gcc-4.2/trunk/gcc/configure.ac Tue Jul  6 14:31:25 2010
@@ -864,6 +864,12 @@
  elif test -x "$LLVMBASEPATH/Debug-Asserts/bin/llc$EXEEXT"; then
      echo Found Debug-Asserts LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Debug-Asserts"
+ elif test -x "$LLVMBASEPATH/Release+Asserts/bin/llc$EXEEXT"; then
+     echo Found Release+Asserts LLVM Tree in $LLVMBASEPATH
+     LLVMBUILDMODE="Release+Asserts"
+ elif test -x "$LLVMBASEPATH/Debug+Asserts/bin/llc$EXEEXT"; then
+     echo Found Debug+Asserts LLVM Tree in $LLVMBASEPATH
+     LLVMBUILDMODE="Debug+Asserts"
  elif test -x "$LLVMBASEPATH/Release+Checks/bin/llc$EXEEXT"; then
      echo Found Release+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Release+Checks"
@@ -876,6 +882,12 @@
  elif test -x "$LLVMBASEPATH/Debug-Asserts+Checks/bin/llc$EXEEXT"; then
      echo Found Debug-Asserts+Checks LLVM Tree in $LLVMBASEPATH
      LLVMBUILDMODE="Debug-Asserts+Checks"
+ elif test -x "$LLVMBASEPATH/Release+Asserts+Checks/bin/llc$EXEEXT"; then
+     echo Found Release+Asserts+Checks LLVM Tree in $LLVMBASEPATH
+     LLVMBUILDMODE="Release+Asserts+Checks"
+ elif test -x "$LLVMBASEPATH/Debug+Asserts+Checks/bin/llc$EXEEXT"; then
+     echo Found Debug+Asserts+Checks LLVM Tree in $LLVMBASEPATH
+     LLVMBUILDMODE="Debug+Asserts+Checks"
  elif test -x "$LLVMBASEPATH/bin/llc$EXEEXT"; then
      echo Found Installed LLVM Tree in $LLVMBASEPATH
  elif test x$LLVMBUILDMODE = x; then