[llvm-commits] [llvm] r120151 - in /llvm/trunk: Makefile.config.in autoconf/configure.ac configure

[Tobias Grosser]

On 11/25/2010 12:57 PM, Duncan Sands wrote:
> Author: baldrick
> Date: Thu Nov 25 11:57:43 2010
> New Revision: 120151
>
> URL: http://llvm.org/viewvc/llvm-project?rev=120151&view=rev
> Log:
> It seems inconsistent to have LLVMCC_EMITIR_FLAG and
> LLVMGCC_DISABLEOPT_FLAGS, one with CC in it, the other
> with GCC.  Rename LLVMGCC_DISABLEOPT_FLAGS to
> LLVMCC_DISABLEOPT_FLAGS.


The reason i called this LLVMGCC_DISABLE_OPT flags was that I was not
sure if "-mllvm -disable-llvm-optzns" will work for clang. So I thought 
I keep it better in the LLVMGCC land, as I believe it was ment for 
llvm-gcc to disable optimizations.

Cheers
Tobi


> Modified:
>      llvm/trunk/Makefile.config.in
>      llvm/trunk/autoconf/configure.ac
>      llvm/trunk/configure
>
> Modified: llvm/trunk/Makefile.config.in
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.config.in?rev=120151&r1=120150&r2=120151&view=diff
> ==============================================================================
> --- llvm/trunk/Makefile.config.in (original)
> +++ llvm/trunk/Makefile.config.in Thu Nov 25 11:57:43 2010
> @@ -196,7 +196,6 @@
>   LLVMCC1PLUS := @LLVMCC1PLUS@
>   LLVMGCC_LANGS := @LLVMGCC_LANGS@
>   LLVMGCC_DRAGONEGG := @LLVMGCC_DRAGONEGG@
> -LLVMGCC_DISABLEOPT_FLAGS := @LLVMGCC_DISABLEOPT_FLAGS@
>
>   # Information on Clang, if configured.
>   CLANGPATH := @CLANGPATH@
> @@ -208,6 +207,7 @@
>
>   # The flag used to emit LLVM IR.
>   LLVMCC_EMITIR_FLAG = @LLVMCC_EMITIR_FLAG@
> +LLVMCC_DISABLEOPT_FLAGS := @LLVMCC_DISABLEOPT_FLAGS@
>
>   # Path to directory where object files should be stored during a build.
>   # Set OBJ_ROOT to "." if you do not want to use a separate place for
>
> Modified: llvm/trunk/autoconf/configure.ac
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=120151&r1=120150&r2=120151&view=diff
> ==============================================================================
> --- llvm/trunk/autoconf/configure.ac (original)
> +++ llvm/trunk/autoconf/configure.ac Thu Nov 25 11:57:43 2010
> @@ -1438,10 +1438,10 @@
>   dnl in llvmgcc
>   if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then
>     LLVMCC_EMITIR_FLAG="-fplugin-arg-dragonegg-emit-ir"
> -  LLVMGCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns"
> +  LLVMCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns"
>   else
>     LLVMCC_EMITIR_FLAG="-emit-llvm"
> -  LLVMGCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns"
> +  LLVMCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns"
>   fi
>
>   AC_SUBST(LLVMCC_EMITIR_FLAG)
> @@ -1472,7 +1472,7 @@
>     llvmgcclangs=[`$LLVMGCC -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`]
>     AC_SUBST(LLVMGCC_LANGS,$llvmgcclangs)
>     AC_SUBST(LLVMGCC_DRAGONEGG,$llvm_cv_llvmgcc_dragonegg)
> -  AC_SUBST(LLVMGCC_DISABLEOPT_FLAGS)
> +  AC_SUBST(LLVMCC_DISABLEOPT_FLAGS)
>     AC_MSG_RESULT([ok])
>   fi
>
>
> Modified: llvm/trunk/configure
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=120151&r1=120150&r2=120151&view=diff
> ==============================================================================
> --- llvm/trunk/configure (original)
> +++ llvm/trunk/configure Thu Nov 25 11:57:43 2010
> @@ -773,12 +773,12 @@
>   HUGE_VAL_SANITY
>   MMAP_FILE
>   LLVMCC_EMITIR_FLAG
> +LLVMCC_DISABLEOPT_FLAGS
>   LLVMCC1
>   LLVMCC1PLUS
>   LLVMGCCDIR
>   LLVMGCC_LANGS
>   LLVMGCC_DRAGONEGG
> -LLVMGCC_DISABLEOPT_FLAGS
>   SHLIBEXT
>   SHLIBPATH_VAR
>   LLVM_PREFIX
> @@ -20600,10 +20600,10 @@
>
>   if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then
>     LLVMCC_EMITIR_FLAG="-fplugin-arg-dragonegg-emit-ir"
> -  LLVMGCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns"
> +  LLVMCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns"
>   else
>     LLVMCC_EMITIR_FLAG="-emit-llvm"
> -  LLVMGCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns"
> +  LLVMCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns"
>   fi
>
>
> @@ -21839,12 +21839,12 @@
>   HUGE_VAL_SANITY!$HUGE_VAL_SANITY$ac_delim
>   MMAP_FILE!$MMAP_FILE$ac_delim
>   LLVMCC_EMITIR_FLAG!$LLVMCC_EMITIR_FLAG$ac_delim
> +LLVMCC_DISABLEOPT_FLAGS!$LLVMCC_DISABLEOPT_FLAGS$ac_delim
>   LLVMCC1!$LLVMCC1$ac_delim
>   LLVMCC1PLUS!$LLVMCC1PLUS$ac_delim
>   LLVMGCCDIR!$LLVMGCCDIR$ac_delim
>   LLVMGCC_LANGS!$LLVMGCC_LANGS$ac_delim
>   LLVMGCC_DRAGONEGG!$LLVMGCC_DRAGONEGG$ac_delim
> -LLVMGCC_DISABLEOPT_FLAGS!$LLVMGCC_DISABLEOPT_FLAGS$ac_delim
>   SHLIBEXT!$SHLIBEXT$ac_delim
>   SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
>   LLVM_PREFIX!$LLVM_PREFIX$ac_delim
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits