[llvm-commits] [llvm] r96981 - in /llvm/trunk: ./ autoconf/ examples/BrainF/ examples/Fibonacci/ examples/HowToUseJIT/ include/llvm/ADT/ include/llvm/Support/ lib/CodeGen/ lib/CodeGen/SelectionDAG/ lib/Transforms/IPO/ test/ test/CodeGen/X86/ test/DebugInfo/ test/FrontendObjC++/ test/FrontendObjC/ test/TableGen/ test/Transforms/FunctionAttrs/ test/Transforms/IndVarSimplify/ test/Transforms/InstCombine/ test/Unit/ tools/llvm-shlib/ unittests/
Jeffrey Yasskin
jyasskin at google.com
Tue Feb 23 12:53:37 PST 2010
Author: jyasskin
Date: Tue Feb 23 14:53:37 2010
New Revision: 96981
URL: http://llvm.org/viewvc/llvm-project?rev=96981&view=rev
Log:
Roll back r96959 again.
Removed:
llvm/trunk/tools/llvm-shlib/
Modified:
llvm/trunk/Makefile
llvm/trunk/Makefile.config.in
llvm/trunk/Makefile.rules
llvm/trunk/autoconf/configure.ac
llvm/trunk/configure
llvm/trunk/examples/BrainF/Makefile
llvm/trunk/examples/Fibonacci/Makefile
llvm/trunk/examples/HowToUseJIT/Makefile
llvm/trunk/include/llvm/ADT/DenseMapInfo.h (props changed)
llvm/trunk/include/llvm/Support/NoFolder.h (props changed)
llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.h (props changed)
llvm/trunk/lib/CodeGen/SelectionDAG/InstrEmitter.h (props changed)
llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h (props changed)
llvm/trunk/lib/CodeGen/VirtRegRewriter.cpp (props changed)
llvm/trunk/lib/CodeGen/VirtRegRewriter.h (props changed)
llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp (props changed)
llvm/trunk/test/CodeGen/X86/optimize-max-0.ll (props changed)
llvm/trunk/test/DebugInfo/2009-11-06-InvalidDerivedType.ll (props changed)
llvm/trunk/test/FrontendObjC++/2007-10-03-MetadataPointers.mm (props changed)
llvm/trunk/test/FrontendObjC/2008-10-3-EhValue.m (props changed)
llvm/trunk/test/Makefile
llvm/trunk/test/TableGen/DagDefSubst.td (props changed)
llvm/trunk/test/TableGen/DagIntSubst.td (props changed)
llvm/trunk/test/Transforms/FunctionAttrs/ (props changed)
llvm/trunk/test/Transforms/FunctionAttrs/2008-09-03-Mutual.ll (props changed)
llvm/trunk/test/Transforms/FunctionAttrs/2008-09-03-ReadNone.ll (props changed)
llvm/trunk/test/Transforms/FunctionAttrs/2008-09-03-ReadOnly.ll (props changed)
llvm/trunk/test/Transforms/FunctionAttrs/2008-09-13-VolatileRead.ll (props changed)
llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate8.ll (props changed)
llvm/trunk/test/Transforms/IndVarSimplify/variable-stride-ivs-0.ll (props changed)
llvm/trunk/test/Transforms/InstCombine/add3.ll (props changed)
llvm/trunk/test/Unit/lit.cfg
llvm/trunk/test/Unit/lit.site.cfg.in
llvm/trunk/unittests/Makefile.unittest
Modified: llvm/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/Makefile (original)
+++ llvm/trunk/Makefile Tue Feb 23 14:53:37 2010
@@ -30,8 +30,8 @@
DIRS := lib/System lib/Support utils
OPTIONAL_DIRS :=
else
- DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-shlib \
- tools/llvm-config tools runtime docs unittests
+ DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
+ tools runtime docs unittests
OPTIONAL_DIRS := projects bindings
endif
Modified: llvm/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.config.in?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/Makefile.config.in (original)
+++ llvm/trunk/Makefile.config.in Tue Feb 23 14:53:37 2010
@@ -262,11 +262,6 @@
# Do we want to build with position independent code?
ENABLE_PIC := @ENABLE_PIC@
-# Do we want to link the tools shared?
-ifndef ENABLE_SHARED
- ENABLE_SHARED := @ENABLE_SHARED@
-endif
-
# Use -fvisibility-inlines-hidden?
ENABLE_VISIBILITY_INLINES_HIDDEN := @ENABLE_VISIBILITY_INLINES_HIDDEN@
@@ -277,9 +272,6 @@
# Enable JIT for this platform
TARGET_HAS_JIT = @TARGET_HAS_JIT@
-# Environment variable to set to change the runtime shared library search path.
-SHLIBPATH_VAR = @SHLIBPATH_VAR@
-
# Shared library extension for host platform.
SHLIBEXT = @SHLIBEXT@
Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Tue Feb 23 14:53:37 2010
@@ -623,12 +623,11 @@
ifneq ($(HOST_OS),Darwin)
ifneq ($(DARWIN_MAJVERS),4)
ifdef TOOLNAME
- LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
- ifdef EXAMPLE_TOOL
- LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(RDYNAMIC)
- else
- LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
- endif
+ifdef EXAMPLE_TOOL
+ LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(RDYNAMIC)
+else
+ LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
+endif
endif
endif
endif
@@ -961,16 +960,11 @@
$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
-ifeq ($(ENABLE_SHARED), 1)
-LLVMLibsOptions += -lLLVM-$(LLVMVersion)
-LLVMLibsPaths += $(LibDir)/libLLVM-$(LLVMVersion)$(SHLIBEXT)
-else
LLVMLibsOptions += $(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS))
LLVMLibsPaths += $(LLVM_CONFIG) \
$(shell $(LLVM_CONFIG) --libfiles $(LINK_COMPONENTS))
endif
endif
-endif
###############################################################################
# Library Build Rules: Four ways to build a library
@@ -1175,13 +1169,11 @@
# If neither BUILD_ARCHIVE or LOADABLE_MODULE are specified, default to
# building an archive.
#---------------------------------------------------------
-ifndef NO_BUILD_ARCHIVE
ifndef BUILD_ARCHIVE
ifndef LOADABLE_MODULE
BUILD_ARCHIVE = 1
endif
endif
-endif
#---------------------------------------------------------
# Archive Library Targets:
Modified: llvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Tue Feb 23 14:53:37 2010
@@ -472,18 +472,6 @@
AC_DEFINE_UNQUOTED([ENABLE_PIC],$ENABLE_PIC,
[Define if position independent code is enabled])
-dnl Allow linking tools against the shared library.
-AC_ARG_ENABLE(shared,
- AS_HELP_STRING([--enable-shared],
- [Link LLVM tools shared (default is NO)]),,
- enableval=default)
-case "$enableval" in
- yes) AC_SUBST(ENABLE_SHARED,[1]) ;;
- no) AC_SUBST(ENABLE_SHARED,[0]) ;;
- default) AC_SUBST(ENABLE_SHARED,[0]) ;;
- *) AC_MSG_ERROR([Invalid setting for --enable-shared. Use "yes" or "no"]) ;;
-esac
-
dnl Allow specific targets to be specified for building (or not)
TARGETS_TO_BUILD=""
AC_ARG_ENABLE([targets],AS_HELP_STRING([--enable-targets],
@@ -1348,10 +1336,6 @@
dnl the Makefiles so we can use it there too
AC_SUBST(SHLIBEXT,$libltdl_cv_shlibext)
-dnl Propagate the run-time library path variable that the libltdl
-dnl checks found to the Makefiles so we can use it there too
-AC_SUBST(SHLIBPATH_VAR,$libltdl_cv_shlibpath_var)
-
# Translate the various configuration directories and other basic
# information into substitutions that will end up in Makefile.config.in
# that these configured values can be used by the makefiles
Modified: llvm/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/configure (original)
+++ llvm/trunk/configure Tue Feb 23 14:53:37 2010
@@ -689,7 +689,6 @@
ENABLE_DOXYGEN
ENABLE_THREADS
ENABLE_PIC
-ENABLE_SHARED
TARGETS_TO_BUILD
LLVM_ENUM_TARGETS
LLVM_ENUM_ASM_PRINTERS
@@ -771,7 +770,6 @@
LLVMGCCDIR
LLVMGCC_LANGS
SHLIBEXT
-SHLIBPATH_VAR
LLVM_PREFIX
LLVM_BINDIR
LLVM_LIBDIR
@@ -1404,7 +1402,6 @@
--enable-threads Use threads if available (default is YES)
--enable-pic Build LLVM with Position Independent Code (default
is YES)
- --enable-shared Link LLVM tools shared (default is NO)
--enable-targets Build specific host targets: all or
target1,target2,... Valid targets are: host, x86,
x86_64, sparc, powerpc, alpha, arm, mips, spu,
@@ -4870,25 +4867,6 @@
_ACEOF
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
- enableval=$enable_shared;
-else
- enableval=default
-fi
-
-case "$enableval" in
- yes) ENABLE_SHARED=1
- ;;
- no) ENABLE_SHARED=0
- ;;
- default) ENABLE_SHARED=0
- ;;
- *) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-shared. Use \"yes\" or \"no\"" >&5
-echo "$as_me: error: Invalid setting for --enable-shared. Use \"yes\" or \"no\"" >&2;}
- { (exit 1); exit 1; }; } ;;
-esac
-
TARGETS_TO_BUILD=""
# Check whether --enable-targets was given.
if test "${enable_targets+set}" = set; then
@@ -11132,7 +11110,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11130 "configure"
+#line 11108 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19713,9 +19691,6 @@
SHLIBEXT=$libltdl_cv_shlibext
-SHLIBPATH_VAR=$libltdl_cv_shlibpath_var
-
-
# Translate the various configuration directories and other basic
# information into substitutions that will end up in Makefile.config.in
# that these configured values can be used by the makefiles
@@ -20773,7 +20748,6 @@
ENABLE_DOXYGEN!$ENABLE_DOXYGEN$ac_delim
ENABLE_THREADS!$ENABLE_THREADS$ac_delim
ENABLE_PIC!$ENABLE_PIC$ac_delim
-ENABLE_SHARED!$ENABLE_SHARED$ac_delim
TARGETS_TO_BUILD!$TARGETS_TO_BUILD$ac_delim
LLVM_ENUM_TARGETS!$LLVM_ENUM_TARGETS$ac_delim
LLVM_ENUM_ASM_PRINTERS!$LLVM_ENUM_ASM_PRINTERS$ac_delim
@@ -20783,6 +20757,7 @@
CLANGPATH!$CLANGPATH$ac_delim
CLANGXXPATH!$CLANGXXPATH$ac_delim
ENABLE_BUILT_CLANG!$ENABLE_BUILT_CLANG$ac_delim
+OPTIMIZE_OPTION!$OPTIMIZE_OPTION$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -20824,7 +20799,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-OPTIMIZE_OPTION!$OPTIMIZE_OPTION$ac_delim
EXTRA_OPTIONS!$EXTRA_OPTIONS$ac_delim
BINUTILS_INCDIR!$BINUTILS_INCDIR$ac_delim
ENABLE_LLVMC_DYNAMIC!$ENABLE_LLVMC_DYNAMIC$ac_delim
@@ -20896,7 +20870,6 @@
LLVMGCCDIR!$LLVMGCCDIR$ac_delim
LLVMGCC_LANGS!$LLVMGCC_LANGS$ac_delim
SHLIBEXT!$SHLIBEXT$ac_delim
-SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
LLVM_PREFIX!$LLVM_PREFIX$ac_delim
LLVM_BINDIR!$LLVM_BINDIR$ac_delim
LLVM_LIBDIR!$LLVM_LIBDIR$ac_delim
@@ -20917,7 +20890,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: llvm/trunk/examples/BrainF/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/BrainF/Makefile?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/examples/BrainF/Makefile (original)
+++ llvm/trunk/examples/BrainF/Makefile Tue Feb 23 14:53:37 2010
@@ -9,9 +9,6 @@
LEVEL = ../..
TOOLNAME = BrainF
EXAMPLE_TOOL = 1
-# To keep the shared library working, we link a few of the examples
-# against it unconditionally.
-ENABLE_SHARED = 1
LINK_COMPONENTS := jit bitwriter nativecodegen interpreter
Modified: llvm/trunk/examples/Fibonacci/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/Fibonacci/Makefile?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/examples/Fibonacci/Makefile (original)
+++ llvm/trunk/examples/Fibonacci/Makefile Tue Feb 23 14:53:37 2010
@@ -10,9 +10,6 @@
LEVEL = ../..
TOOLNAME = Fibonacci
EXAMPLE_TOOL = 1
-# To keep the shared library working, we link a few of the examples
-# against it unconditionally.
-ENABLE_SHARED = 1
# Link in JIT support
LINK_COMPONENTS := jit interpreter nativecodegen
Modified: llvm/trunk/examples/HowToUseJIT/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/HowToUseJIT/Makefile?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/examples/HowToUseJIT/Makefile (original)
+++ llvm/trunk/examples/HowToUseJIT/Makefile Tue Feb 23 14:53:37 2010
@@ -9,9 +9,6 @@
LEVEL = ../..
TOOLNAME = HowToUseJIT
EXAMPLE_TOOL = 1
-# To keep the shared library working, we link a few of the examples
-# against it unconditionally.
-ENABLE_SHARED = 1
LINK_COMPONENTS := jit interpreter nativecodegen
Propchange: llvm/trunk/include/llvm/ADT/DenseMapInfo.h
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/include/llvm/Support/NoFolder.h
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.h
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/lib/CodeGen/SelectionDAG/InstrEmitter.h
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/lib/CodeGen/VirtRegRewriter.cpp
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/lib/CodeGen/VirtRegRewriter.h
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/lib/Transforms/IPO/FunctionAttrs.cpp
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/CodeGen/X86/optimize-max-0.ll
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/DebugInfo/2009-11-06-InvalidDerivedType.ll
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/FrontendObjC++/2007-10-03-MetadataPointers.mm
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/FrontendObjC/2008-10-3-EhValue.m
------------------------------------------------------------------------------
(empty)
Modified: llvm/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Makefile?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/test/Makefile (original)
+++ llvm/trunk/test/Makefile Tue Feb 23 14:53:37 2010
@@ -198,6 +198,4 @@
-e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \
-e "s#@LLVMGCCDIR@#$(LLVMGCCDIR)#g" \
-e "s#@LLVM_BUILD_MODE@#$(BuildMode)#g" \
- -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \
- -e "s#@SHLIBPATH_VAR@#$(SHLIBPATH_VAR)#g" \
$(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
Propchange: llvm/trunk/test/TableGen/DagDefSubst.td
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/TableGen/DagIntSubst.td
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/Transforms/FunctionAttrs/
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/Transforms/FunctionAttrs/2008-09-03-Mutual.ll
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/Transforms/FunctionAttrs/2008-09-03-ReadNone.ll
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/Transforms/FunctionAttrs/2008-09-03-ReadOnly.ll
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/Transforms/FunctionAttrs/2008-09-13-VolatileRead.ll
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate8.ll
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/Transforms/IndVarSimplify/variable-stride-ivs-0.ll
------------------------------------------------------------------------------
(empty)
Propchange: llvm/trunk/test/Transforms/InstCombine/add3.ll
------------------------------------------------------------------------------
(empty)
Modified: llvm/trunk/test/Unit/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Unit/lit.cfg?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/test/Unit/lit.cfg (original)
+++ llvm/trunk/test/Unit/lit.cfg Tue Feb 23 14:53:37 2010
@@ -23,14 +23,7 @@
###
-# If necessary, point the dynamic loader at libLLVM.so.
-if config.enable_shared:
- libdir = os.path.join(config.llvm_obj_root, config.llvm_build_mode, 'lib')
- shlibpath = config.environment.get(config.shlibpath_var,'')
- if shlibpath:
- shlibpath = ':' + shlibpath
- shlibpath = libdir + shlibpath
- config.environment[config.shlibpath_var] = shlibpath
+import os
# Check that the object root is known.
if config.test_exec_root is None:
Modified: llvm/trunk/test/Unit/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Unit/lit.site.cfg.in?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/test/Unit/lit.site.cfg.in (original)
+++ llvm/trunk/test/Unit/lit.site.cfg.in Tue Feb 23 14:53:37 2010
@@ -5,8 +5,6 @@
config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
config.llvmgcc_dir = "@LLVMGCCDIR@"
config.llvm_build_mode = "@LLVM_BUILD_MODE@"
-config.enable_shared = @ENABLE_SHARED@
-config.shlibpath_var = "@SHLIBPATH_VAR@"
# Let the main config do the real work.
lit.load_config(config, "@LLVM_SOURCE_DIR@/test/Unit/lit.cfg")
Modified: llvm/trunk/unittests/Makefile.unittest
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile.unittest?rev=96981&r1=96980&r2=96981&view=diff
==============================================================================
--- llvm/trunk/unittests/Makefile.unittest (original)
+++ llvm/trunk/unittests/Makefile.unittest Tue Feb 23 14:53:37 2010
@@ -28,17 +28,6 @@
CPP.Flags += $(NO_VARIADIC_MACROS)
TESTLIBS = -lGoogleTest -lUnitTestMain
-ifeq ($(ENABLE_SHARED), 1)
- # Add the absolute path to the dynamic library. This is ok because
- # we'll never install unittests.
- LD.Flags += $(RPATH) -Wl,$(LibDir)
-endif
-ifeq ($(ENABLE_SHARED), 1)
- # Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most
- # of the time.
- Run.Shared := $(SHLIBPATH_VAR)="$(LibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)"
-endif
-
$(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
$(Echo) Linking $(BuildMode) unit test $(TESTNAME) $(StripWarnMsg)
$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
@@ -49,6 +38,6 @@
all:: $(LLVMUnitTestExe)
unitcheck:: $(LLVMUnitTestExe)
- $(Run.Shared) $(LLVMUnitTestExe)
+ $(LLVMUnitTestExe)
endif
More information about the llvm-commits
mailing list