X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.config.in;h=efa8a0b87466255c8acce07da529ab3a58238f10;hb=2c6f9f7227897e0487917f454200a9d167bcda2f;hp=7f2acf2397084ea43f431873251b03b03bf3d289;hpb=673612ec72e0e246ca671a3977666424b5ed77cc;p=oota-llvm.git

diff --git a/Makefile.config.in b/Makefile.config.in
index 7f2acf23970..efa8a0b8746 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -4,7 +4,7 @@
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
-# 
+#
 #===------------------------------------------------------------------------===#
 #
 # This file is included by Makefile.common.  It defines paths and other
@@ -133,12 +133,10 @@ AR_PATH = @AR@
 NM_PATH = @NM@
 
 # The pathnames of the programs we require to build
-BISON      := @BISON@
 CMP        := @CMP@
 CP         := @CP@
 DATE       := @DATE@
 FIND       := @FIND@
-FLEX       := @LEX@
 GREP       := @GREP@
 INSTALL    := @INSTALL@
 MKDIR      := $(LLVM_SRC_ROOT)/autoconf/mkinstalldirs
@@ -147,10 +145,9 @@ RANLIB     := @RANLIB@
 RM         := @RM@
 SED        := @SED@
 TAR        := @TAR@
-YACC       := @YACC@
 
 # Paths to miscellaneous programs we hope are present but might not be
-PERL       := @PERL@ 
+PERL       := @PERL@
 BZIP2      := @BZIP2@
 DOT        := @DOT@
 DOXYGEN    := @DOXYGEN@
@@ -160,6 +157,7 @@ OCAMLC     := @OCAMLC@
 OCAMLOPT   := @OCAMLOPT@
 OCAMLDEP   := @OCAMLDEP@
 OCAMLDOC   := @OCAMLDOC@
+GAS        := @GAS@
 POD2HTML   := @POD2HTML@
 POD2MAN    := @POD2MAN@
 RUNTEST    := @RUNTEST@
@@ -202,15 +200,29 @@ LLVMGCC_LANGS := @LLVMGCC_LANGS@
 # object files.
 OBJ_ROOT := .
 
+# What to pass as rpath flag to g++
+RPATH := @RPATH@
+
+# What to pass as -rdynamic flag to g++
+RDYNAMIC := @RDYNAMIC@
+
 # These are options that can either be enabled here, or can be enabled on the
 # make command line (ie, make ENABLE_PROFILING=1):
 
 # When ENABLE_OPTIMIZED is enabled, LLVM code is optimized and output is put
-# into the "Release" directories. Otherwise, LLVM code is not optimized and 
+# into the "Release" directories. Otherwise, LLVM code is not optimized and
 # output is put in the "Debug" directories.
 #ENABLE_OPTIMIZED = 1
 @ENABLE_OPTIMIZED@
 
+# When ENABLE_PROFILING is enabled, profile instrumentation is done
+# and output is put into the "<Flavor>+Profile" directories, where
+# <Flavor> is either Debug or Release depending on how other builkd
+# flags are set.. Otherwise, output is put in the <Flavor>
+# directories.
+#ENABLE_PROFILING = 1
+@ENABLE_PROFILING@
+
 # When DISABLE_ASSERTIONS is enabled, builds of all of the LLVM code will 
 # exclude assertion checks, otherwise they are included.
 #DISABLE_ASSERTIONS = 1
@@ -282,3 +294,6 @@ ifneq (,$(findstring -mno-cygwin, $(CXX)))
 else
   SYSPATH = $(1)
 endif
+
+# Location of the plugin header file for gold.
+BINUTILS_INCDIR := @BINUTILS_INCDIR@