llvm.org GIT mirror llvm / 1ac320e
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120151 91177308-0d34-0410-b5e6-96231b3b80d8 Duncan Sands 8 years ago
3 changed file(s) with 8 addition(s) and 8 deletion(s). Raw diff Collapse all Expand all
195195 LLVMCC1PLUS := @LLVMCC1PLUS@
196196 LLVMGCC_LANGS := @LLVMGCC_LANGS@
197197 LLVMGCC_DRAGONEGG := @LLVMGCC_DRAGONEGG@
198 LLVMGCC_DISABLEOPT_FLAGS := @LLVMGCC_DISABLEOPT_FLAGS@
199198
200199 # Information on Clang, if configured.
201200 CLANGPATH := @CLANGPATH@
207206
208207 # The flag used to emit LLVM IR.
209208 LLVMCC_EMITIR_FLAG = @LLVMCC_EMITIR_FLAG@
209 LLVMCC_DISABLEOPT_FLAGS := @LLVMCC_DISABLEOPT_FLAGS@
210210
211211 # Path to directory where object files should be stored during a build.
212212 # Set OBJ_ROOT to "." if you do not want to use a separate place for
14371437 dnl in llvmgcc
14381438 if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then
14391439 LLVMCC_EMITIR_FLAG="-fplugin-arg-dragonegg-emit-ir"
1440 LLVMGCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns"
1440 LLVMCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns"
14411441 else
14421442 LLVMCC_EMITIR_FLAG="-emit-llvm"
1443 LLVMGCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns"
1443 LLVMCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns"
14441444 fi
14451445
14461446 AC_SUBST(LLVMCC_EMITIR_FLAG)
14711471 llvmgcclangs=[`$LLVMGCC -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`]
14721472 AC_SUBST(LLVMGCC_LANGS,$llvmgcclangs)
14731473 AC_SUBST(LLVMGCC_DRAGONEGG,$llvm_cv_llvmgcc_dragonegg)
1474 AC_SUBST(LLVMGCC_DISABLEOPT_FLAGS)
1474 AC_SUBST(LLVMCC_DISABLEOPT_FLAGS)
14751475 AC_MSG_RESULT([ok])
14761476 fi
14771477
772772 HUGE_VAL_SANITY
773773 MMAP_FILE
774774 LLVMCC_EMITIR_FLAG
775 LLVMCC_DISABLEOPT_FLAGS
775776 LLVMCC1
776777 LLVMCC1PLUS
777778 LLVMGCCDIR
778779 LLVMGCC_LANGS
779780 LLVMGCC_DRAGONEGG
780 LLVMGCC_DISABLEOPT_FLAGS
781781 SHLIBEXT
782782 SHLIBPATH_VAR
783783 LLVM_PREFIX
2059920599
2060020600 if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then
2060120601 LLVMCC_EMITIR_FLAG="-fplugin-arg-dragonegg-emit-ir"
20602 LLVMGCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns"
20602 LLVMCC_DISABLEOPT_FLAGS="-fplugin-arg-dragonegg-disable-llvm-optzns"
2060320603 else
2060420604 LLVMCC_EMITIR_FLAG="-emit-llvm"
20605 LLVMGCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns"
20605 LLVMCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns"
2060620606 fi
2060720607
2060820608
2183821838 HUGE_VAL_SANITY!$HUGE_VAL_SANITY$ac_delim
2183921839 MMAP_FILE!$MMAP_FILE$ac_delim
2184021840 LLVMCC_EMITIR_FLAG!$LLVMCC_EMITIR_FLAG$ac_delim
21841 LLVMCC_DISABLEOPT_FLAGS!$LLVMCC_DISABLEOPT_FLAGS$ac_delim
2184121842 LLVMCC1!$LLVMCC1$ac_delim
2184221843 LLVMCC1PLUS!$LLVMCC1PLUS$ac_delim
2184321844 LLVMGCCDIR!$LLVMGCCDIR$ac_delim
2184421845 LLVMGCC_LANGS!$LLVMGCC_LANGS$ac_delim
2184521846 LLVMGCC_DRAGONEGG!$LLVMGCC_DRAGONEGG$ac_delim
21846 LLVMGCC_DISABLEOPT_FLAGS!$LLVMGCC_DISABLEOPT_FLAGS$ac_delim
2184721847 SHLIBEXT!$SHLIBEXT$ac_delim
2184821848 SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
2184921849 LLVM_PREFIX!$LLVM_PREFIX$ac_delim