mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-06-26 10:29:57 +00:00
Roll back the shared library, r96559. It broke two darwins and arm, mysteriously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96569 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jeffrey Yasskin
parent
adb561d4e0
commit
2155d459a7
4
Makefile
4
Makefile
|
|
@ -30,8 +30,8 @@ ifeq ($(BUILD_DIRS_ONLY),1)
|
|||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -266,9 +266,6 @@ ENABLE_THREADS := @ENABLE_THREADS@
|
|||
# Do we want to build with position independent code?
|
||||
ENABLE_PIC := @ENABLE_PIC@
|
||||
|
||||
# Do we want to link the tools shared?
|
||||
ENABLE_SHARED := @ENABLE_SHARED@
|
||||
|
||||
# Use -fvisibility-inlines-hidden?
|
||||
ENABLE_VISIBILITY_INLINES_HIDDEN := @ENABLE_VISIBILITY_INLINES_HIDDEN@
|
||||
|
||||
|
|
@ -279,9 +276,6 @@ ENABLE_VISIBILITY_INLINES_HIDDEN := @ENABLE_VISIBILITY_INLINES_HIDDEN@
|
|||
# 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@
|
||||
|
||||
|
|
|
|||
|
|
@ -613,12 +613,11 @@ endif
|
|||
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
|
||||
|
|
@ -953,21 +952,11 @@ $(LLVM_CONFIG):
|
|||
|
||||
$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
|
||||
|
||||
ifeq ($(ENABLE_SHARED), 1)
|
||||
LLVMLibsOptions += -lLLVM$(LLVMVersion)
|
||||
LLVMLibsPaths += $(LibDir)/libLLVM$(LLVMVersion)$(SHLIBEXT)
|
||||
else
|
||||
ifeq ($(EXAMPLE_TOOL), 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
|
||||
endif
|
||||
|
||||
###############################################################################
|
||||
# Library Build Rules: Four ways to build a library
|
||||
|
|
@ -1173,13 +1162,11 @@ endif
|
|||
# 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:
|
||||
|
|
|
|||
|
|
@ -470,18 +470,6 @@ esac
|
|||
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],
|
||||
|
|
@ -1277,10 +1265,6 @@ dnl Propagate the shared library extension that the libltdl checks did to
|
|||
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
|
||||
|
|
|
|||
33
configure
vendored
33
configure
vendored
|
|
@ -689,7 +689,6 @@ TARGET_HAS_JIT
|
|||
ENABLE_DOXYGEN
|
||||
ENABLE_THREADS
|
||||
ENABLE_PIC
|
||||
ENABLE_SHARED
|
||||
TARGETS_TO_BUILD
|
||||
LLVM_ENUM_TARGETS
|
||||
LLVM_ENUM_ASM_PRINTERS
|
||||
|
|
@ -770,7 +769,6 @@ LLVMGCC_VERSION
|
|||
LLVMGCC_MAJVERS
|
||||
LLVMGCC_LANGS
|
||||
SHLIBEXT
|
||||
SHLIBPATH_VAR
|
||||
LLVM_PREFIX
|
||||
LLVM_BINDIR
|
||||
LLVM_LIBDIR
|
||||
|
|
@ -1403,7 +1401,6 @@ Optional Features:
|
|||
--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,
|
||||
|
|
@ -4860,25 +4857,6 @@ cat >>confdefs.h <<_ACEOF
|
|||
_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
|
||||
|
|
@ -11057,7 +11035,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 11060 "configure"
|
||||
#line 11038 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -19617,9 +19595,6 @@ fi
|
|||
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
|
||||
|
|
@ -20677,7 +20652,6 @@ TARGET_HAS_JIT!$TARGET_HAS_JIT$ac_delim
|
|||
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
|
||||
|
|
@ -20687,6 +20661,7 @@ ENABLE_CBE_PRINTF_A!$ENABLE_CBE_PRINTF_A$ac_delim
|
|||
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
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
|
|
@ -20728,7 +20703,6 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
ENABLE_LLVMC_DYNAMIC!$ENABLE_LLVMC_DYNAMIC$ac_delim
|
||||
ENABLE_LLVMC_DYNAMIC_PLUGINS!$ENABLE_LLVMC_DYNAMIC_PLUGINS$ac_delim
|
||||
CXX!$CXX$ac_delim
|
||||
CXXFLAGS!$CXXFLAGS$ac_delim
|
||||
|
|
@ -20799,7 +20773,6 @@ LLVMGCC_VERSION!$LLVMGCC_VERSION$ac_delim
|
|||
LLVMGCC_MAJVERS!$LLVMGCC_MAJVERS$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
|
||||
|
|
@ -20820,7 +20793,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
|||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
|
|||
|
|
@ -200,6 +200,4 @@ Unit/lit.site.cfg: $(PROJ_OBJ_DIR)/Unit/.dir FORCE
|
|||
-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 > $@
|
||||
|
|
|
|||
|
|
@ -23,14 +23,7 @@ config.test_format = lit.formats.GoogleTest(llvm_build_mode, 'Tests')
|
|||
|
||||
###
|
||||
|
||||
# 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:
|
||||
|
|
|
|||
|
|
@ -5,8 +5,6 @@ config.llvm_obj_root = "@LLVM_BINARY_DIR@"
|
|||
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")
|
||||
|
|
|
|||
|
|
@ -1,61 +0,0 @@
|
|||
##===- tools/shlib/Makefile --------------------------------*- Makefile -*-===##
|
||||
#
|
||||
# The LLVM Compiler Infrastructure
|
||||
#
|
||||
# This file is distributed under the University of Illinois Open Source
|
||||
# License. See LICENSE.TXT for details.
|
||||
#
|
||||
##===----------------------------------------------------------------------===##
|
||||
|
||||
LEVEL = ../..
|
||||
LIBRARYNAME = LLVM$(LLVMVersion)
|
||||
|
||||
NO_BUILD_ARCHIVE = 1
|
||||
LINK_LIBS_IN_SHARED = 1
|
||||
SHARED_LIBRARY = 1
|
||||
|
||||
include $(LEVEL)/Makefile.common
|
||||
|
||||
# Include all archives in libLLVM.(so|dylib) except the ones that have
|
||||
# their own dynamic libraries.
|
||||
Archives := $(wildcard $(LibDir)/libLLVM*.a)
|
||||
SharedLibraries := $(wildcard $(LibDir)/libLLVM*$(SHLIBEXT))
|
||||
IncludeInLibLlvm := $(filter-out $(basename $(SharedLibraries)).a, $(Archives))
|
||||
LLVMLibsOptions := $(IncludeInLibLlvm:$(LibDir)/lib%.a=-l%)
|
||||
LLVMLibsPaths := $(IncludeInLibLlvm)
|
||||
|
||||
$(LibName.SO): $(LLVMLibsPaths)
|
||||
|
||||
ifeq ($(HOST_OS),Darwin)
|
||||
# set dylib internal version number to llvmCore submission number
|
||||
ifdef LLVM_SUBMIT_VERSION
|
||||
LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-current_version \
|
||||
-Wl,$(LLVM_SUBMIT_VERSION).$(LLVM_SUBMIT_SUBVERSION) \
|
||||
-Wl,-compatibility_version -Wl,1
|
||||
endif
|
||||
# Include everything from the .a's into the shared library.
|
||||
LLVMLibsOptions := $(LLVMLibsOptions) \
|
||||
-Wl,-all_load
|
||||
# extra options to override libtool defaults
|
||||
LLVMLibsOptions := $(LLVMLibsOptions) \
|
||||
-avoid-version \
|
||||
-Wl,-dead_strip \
|
||||
-Wl,-seg1addr -Wl,0xE0000000
|
||||
|
||||
# Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
|
||||
DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
|
||||
ifneq ($(DARWIN_VERS),8)
|
||||
LLVMLibsOptions := $(LLVMLibsOptions) \
|
||||
-Wl,-install_name \
|
||||
-Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(HOST_OS), Linux)
|
||||
# Include everything from the .a's into the shared library.
|
||||
LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \
|
||||
-Wl,--no-whole-archive
|
||||
# Don't allow unresolved symbols, and warn if we'll need to modify
|
||||
# the text segment when loading libLLVM.so.
|
||||
LLVMLibsOptions += -Wl,--no-undefined,--warn-shared-textrel
|
||||
endif
|
||||
|
|
@ -28,10 +28,6 @@ CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/
|
|||
CPP.Flags += $(NO_VARIADIC_MACROS)
|
||||
TESTLIBS = -lGoogleTest -lUnitTestMain
|
||||
|
||||
ifeq ($(ENABLE_SHARED), 1)
|
||||
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) \
|
||||
|
|
@ -42,6 +38,6 @@ $(LLVMUnitTestExe): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
|
|||
all:: $(LLVMUnitTestExe)
|
||||
|
||||
unitcheck:: $(LLVMUnitTestExe)
|
||||
$(Run.Shared) $(LLVMUnitTestExe)
|
||||
$(LLVMUnitTestExe)
|
||||
|
||||
endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user