mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-26 04:40:38 +00:00
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. llvm-svn: 120151
This commit is contained in:
parent
8689c9176b
commit
7bda5159fa
@ -196,7 +196,6 @@ LLVMCC1 := @LLVMCC1@
|
||||
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 @@ LLVMCC_OPTION := @LLVMCC_OPTION@
|
||||
|
||||
# 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
|
||||
|
@ -1438,10 +1438,10 @@ dnl Set the flags needed to emit LLVM IR and to disable optimizations
|
||||
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 @@ if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then
|
||||
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
|
||||
|
||||
|
8
configure
vendored
8
configure
vendored
@ -773,12 +773,12 @@ HAVE_PTHREAD
|
||||
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 @@ echo "${ECHO_T}$llvm_cv_llvmgcc_dragonegg" >&6; }
|
||||
|
||||
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 @@ HAVE_PTHREAD!$HAVE_PTHREAD$ac_delim
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user