Fix merge error in my last fix to Thumb2 vldr fixups.

[oota-llvm.git] / Makefile.config.in

diff --git a/Makefile.config.in b/Makefile.config.in
index a4d9f3d7c5fd5252ad03dac28369da1ca4514f29..73d2d871f4fb09e26425c7c12ca9b734d91e9d6d 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -164,7 +164,7 @@ CAT        := @CAT@
 DOT        := @DOT@
 DOXYGEN    := @DOXYGEN@
 GROFF      := @GROFF@
-GZIP       := @GZIP@
+GZIPBIN    := @GZIPBIN@
 OCAMLC     := @OCAMLC@
 OCAMLOPT   := @OCAMLOPT@
 OCAMLDEP   := @OCAMLDEP@
@@ -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