RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 12:50:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

It seems inconsistent to have LLVMCC_EMITIR_FLAG and

Browse Source 
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:
Duncan Sands 2010-11-25 17:57:43 +00:00
parent 8689c9176b
commit 7bda5159fa
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.config.in
View File

@ -196,7 +196,6 @@ LLVMCC1 := @LLVMCC1@
LLVMCC1PLUS := @LLVMCC1PLUS@ LLVMCC1PLUS := @LLVMCC1PLUS@
LLVMGCC_LANGS := @LLVMGCC_LANGS@ LLVMGCC_LANGS := @LLVMGCC_LANGS@
LLVMGCC_DRAGONEGG := @LLVMGCC_DRAGONEGG@ LLVMGCC_DRAGONEGG := @LLVMGCC_DRAGONEGG@
LLVMGCC_DISABLEOPT_FLAGS := @LLVMGCC_DISABLEOPT_FLAGS@
# Information on Clang, if configured. # Information on Clang, if configured.
CLANGPATH := @CLANGPATH@ CLANGPATH := @CLANGPATH@
@ -208,6 +207,7 @@ LLVMCC_OPTION := @LLVMCC_OPTION@
# The flag used to emit LLVM IR. # The flag used to emit LLVM IR.
LLVMCC_EMITIR_FLAG = @LLVMCC_EMITIR_FLAG@ LLVMCC_EMITIR_FLAG = @LLVMCC_EMITIR_FLAG@
LLVMCC_DISABLEOPT_FLAGS := @LLVMCC_DISABLEOPT_FLAGS@
# Path to directory where object files should be stored during a build. # 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 # Set OBJ_ROOT to "." if you do not want to use a separate place for

6
autoconf/configure.ac
View File

@ -1438,10 +1438,10 @@ dnl Set the flags needed to emit LLVM IR and to disable optimizations
dnl in llvmgcc dnl in llvmgcc
if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then
LLVMCC_EMITIR_FLAG="-fplugin-arg-dragonegg-emit-ir" 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 else
LLVMCC_EMITIR_FLAG="-emit-llvm" LLVMCC_EMITIR_FLAG="-emit-llvm"
LLVMGCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns" LLVMCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns"
fi fi
AC_SUBST(LLVMCC_EMITIR_FLAG) 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/'`] llvmgcclangs=[`$LLVMGCC -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`]
AC_SUBST(LLVMGCC_LANGS,$llvmgcclangs) AC_SUBST(LLVMGCC_LANGS,$llvmgcclangs)
AC_SUBST(LLVMGCC_DRAGONEGG,$llvm_cv_llvmgcc_dragonegg) AC_SUBST(LLVMGCC_DRAGONEGG,$llvm_cv_llvmgcc_dragonegg)
AC_SUBST(LLVMGCC_DISABLEOPT_FLAGS) AC_SUBST(LLVMCC_DISABLEOPT_FLAGS)
AC_MSG_RESULT([ok]) AC_MSG_RESULT([ok])
fi fi

8
configure vendored
View File

@ -773,12 +773,12 @@ HAVE_PTHREAD
HUGE_VAL_SANITY HUGE_VAL_SANITY
MMAP_FILE MMAP_FILE
LLVMCC_EMITIR_FLAG LLVMCC_EMITIR_FLAG
LLVMCC_DISABLEOPT_FLAGS
LLVMCC1 LLVMCC1
LLVMCC1PLUS LLVMCC1PLUS
LLVMGCCDIR LLVMGCCDIR
LLVMGCC_LANGS LLVMGCC_LANGS
LLVMGCC_DRAGONEGG LLVMGCC_DRAGONEGG
LLVMGCC_DISABLEOPT_FLAGS
SHLIBEXT SHLIBEXT
SHLIBPATH_VAR SHLIBPATH_VAR
LLVM_PREFIX LLVM_PREFIX
@ -20600,10 +20600,10 @@ echo "${ECHO_T}$llvm_cv_llvmgcc_dragonegg" >&6; }
if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then if test "$llvm_cv_llvmgcc_dragonegg" = "yes" ; then
LLVMCC_EMITIR_FLAG="-fplugin-arg-dragonegg-emit-ir" 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 else
LLVMCC_EMITIR_FLAG="-emit-llvm" LLVMCC_EMITIR_FLAG="-emit-llvm"
LLVMGCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns" LLVMCC_DISABLEOPT_FLAGS="-mllvm -disable-llvm-optzns"
fi fi
@ -21839,12 +21839,12 @@ HAVE_PTHREAD!$HAVE_PTHREAD$ac_delim
HUGE_VAL_SANITY!$HUGE_VAL_SANITY$ac_delim HUGE_VAL_SANITY!$HUGE_VAL_SANITY$ac_delim
MMAP_FILE!$MMAP_FILE$ac_delim MMAP_FILE!$MMAP_FILE$ac_delim
LLVMCC_EMITIR_FLAG!$LLVMCC_EMITIR_FLAG$ac_delim LLVMCC_EMITIR_FLAG!$LLVMCC_EMITIR_FLAG$ac_delim
LLVMCC_DISABLEOPT_FLAGS!$LLVMCC_DISABLEOPT_FLAGS$ac_delim
LLVMCC1!$LLVMCC1$ac_delim LLVMCC1!$LLVMCC1$ac_delim
LLVMCC1PLUS!$LLVMCC1PLUS$ac_delim LLVMCC1PLUS!$LLVMCC1PLUS$ac_delim
LLVMGCCDIR!$LLVMGCCDIR$ac_delim LLVMGCCDIR!$LLVMGCCDIR$ac_delim
LLVMGCC_LANGS!$LLVMGCC_LANGS$ac_delim LLVMGCC_LANGS!$LLVMGCC_LANGS$ac_delim
LLVMGCC_DRAGONEGG!$LLVMGCC_DRAGONEGG$ac_delim LLVMGCC_DRAGONEGG!$LLVMGCC_DRAGONEGG$ac_delim
LLVMGCC_DISABLEOPT_FLAGS!$LLVMGCC_DISABLEOPT_FLAGS$ac_delim
SHLIBEXT!$SHLIBEXT$ac_delim SHLIBEXT!$SHLIBEXT$ac_delim
SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
LLVM_PREFIX!$LLVM_PREFIX$ac_delim LLVM_PREFIX!$LLVM_PREFIX$ac_delim