6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-26 21:32:10 +00:00
Code Issues Projects Releases Wiki Activity

Revert previous patch here, we should instead configure in specific

Browse Source 
packages for particular uses.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@161246 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2012-08-03 17:45:31 +00:00
parent 3cd9f572ed
commit 42dffa50c5
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.config.in
View File

@ -196,7 +196,6 @@ ZIP := @ZIP@
HAVE_PTHREAD := @HAVE_PTHREAD@ HAVE_PTHREAD := @HAVE_PTHREAD@
LIBS := @LIBS@ LIBS := @LIBS@
BUILD_FLAGS := @BUILD_FLAGS@
# Targets that we should build # Targets that we should build
TARGETS_TO_BUILD=@TARGETS_TO_BUILD@ TARGETS_TO_BUILD=@TARGETS_TO_BUILD@

6
Makefile.rules
View File

@ -730,13 +730,13 @@ else
endif endif
Compile.C = $(Compile.Wrapper) \ Compile.C = $(Compile.Wrapper) \
$(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) $(BUILD_FLAGS) \ $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
$(TargetCommonOpts) $(CompileCommonOpts) -c $(TargetCommonOpts) $(CompileCommonOpts) -c
Compile.CXX = $(Compile.Wrapper) \ Compile.CXX = $(Compile.Wrapper) \
$(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(CPPFLAGS) $(BUILD_FLAGS) \ $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(CPPFLAGS) \
$(TargetCommonOpts) $(CompileCommonOpts) -c $(TargetCommonOpts) $(CompileCommonOpts) -c
Preprocess.CXX= $(Compile.Wrapper) \ Preprocess.CXX= $(Compile.Wrapper) \
$(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) $(BUILD_FLAGS) \ $(CXX) $(CPP.Flags) $(TargetCommonOpts) $(CPPFLAGS) \
$(CompileCommonOpts) $(CXX.Flags) -E $(CompileCommonOpts) $(CXX.Flags) -E
Link = $(Compile.Wrapper) \ Link = $(Compile.Wrapper) \
$(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LD.Flags) \ $(CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) $(LD.Flags) \

7
autoconf/configure.ac
View File

@ -1201,7 +1201,7 @@ AC_ARG_WITH(oprofile,
no) llvm_cv_oppath= no) llvm_cv_oppath=
AC_SUBST(USE_OPROFILE, [0]) ;; AC_SUBST(USE_OPROFILE, [0]) ;;
*) llvm_cv_oppath="${withval}/lib/oprofile" *) llvm_cv_oppath="${withval}/lib/oprofile"
BUILD_FLAGS="-I${withval}/include";; CPPFLAGS="-I${withval}/include";;
esac esac
case $llvm_cv_os_type in case $llvm_cv_os_type in
Linux) Linux)
@ -1262,7 +1262,7 @@ AC_ARG_WITH(intel-jitevents,
AC_SUBST(INTEL_JITEVENTS_LIBDIR) AC_SUBST(INTEL_JITEVENTS_LIBDIR)
LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}" LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}"
BUILD_FLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR" CPPFLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
AC_SEARCH_LIBS(iJIT_IsProfilingActive, jitprofiling, [], [ AC_SEARCH_LIBS(iJIT_IsProfilingActive, jitprofiling, [], [
echo "Error! Cannot find libjitprofiling.a. Please check path specified in flag --with-intel-jitevents" echo "Error! Cannot find libjitprofiling.a. Please check path specified in flag --with-intel-jitevents"
@ -1280,9 +1280,6 @@ AC_ARG_WITH(intel-jitevents,
AC_DEFINE_UNQUOTED([LLVM_USE_INTEL_JITEVENTS],$USE_INTEL_JITEVENTS, AC_DEFINE_UNQUOTED([LLVM_USE_INTEL_JITEVENTS],$USE_INTEL_JITEVENTS,
[Define if we have the Intel JIT API runtime support library]) [Define if we have the Intel JIT API runtime support library])
dnl Substitute this here for now.
AC_SUBST(BUILD_FLAGS)
dnl===-----------------------------------------------------------------------=== dnl===-----------------------------------------------------------------------===
dnl=== dnl===
dnl=== SECTION 6: Check for header files dnl=== SECTION 6: Check for header files

12
configure vendored
View File

@ -765,7 +765,6 @@ USE_OPROFILE
USE_INTEL_JITEVENTS USE_INTEL_JITEVENTS
INTEL_JITEVENTS_INCDIR INTEL_JITEVENTS_INCDIR
INTEL_JITEVENTS_LIBDIR INTEL_JITEVENTS_LIBDIR
BUILD_FLAGS
HAVE_PTHREAD HAVE_PTHREAD
HUGE_VAL_SANITY HUGE_VAL_SANITY
MMAP_FILE MMAP_FILE
@ -10211,7 +10210,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 10214 "configure" #line 10213 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -13074,7 +13073,7 @@ if test "${with_oprofile+set}" = set; then
USE_OPROFILE=0 USE_OPROFILE=0
;; ;;
*) llvm_cv_oppath="${withval}/lib/oprofile" *) llvm_cv_oppath="${withval}/lib/oprofile"
BUILD_FLAGS="-I${withval}/include";; CPPFLAGS="-I${withval}/include";;
esac esac
case $llvm_cv_os_type in case $llvm_cv_os_type in
Linux) Linux)
@ -13501,7 +13500,7 @@ echo "$as_me: error:
LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}" LIBS="$LIBS -L${INTEL_JITEVENTS_LIBDIR}"
BUILD_FLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR" CPPFLAGS="$CPPFLAGS -I$INTEL_JITEVENTS_INCDIR"
{ echo "$as_me:$LINENO: checking for library containing iJIT_IsProfilingActive" >&5 { echo "$as_me:$LINENO: checking for library containing iJIT_IsProfilingActive" >&5
echo $ECHO_N "checking for library containing iJIT_IsProfilingActive... $ECHO_C" >&6; } echo $ECHO_N "checking for library containing iJIT_IsProfilingActive... $ECHO_C" >&6; }
@ -13792,8 +13791,6 @@ _ACEOF
ac_header_dirent=no ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@ -22062,7 +22059,6 @@ USE_OPROFILE!$USE_OPROFILE$ac_delim
USE_INTEL_JITEVENTS!$USE_INTEL_JITEVENTS$ac_delim USE_INTEL_JITEVENTS!$USE_INTEL_JITEVENTS$ac_delim
INTEL_JITEVENTS_INCDIR!$INTEL_JITEVENTS_INCDIR$ac_delim INTEL_JITEVENTS_INCDIR!$INTEL_JITEVENTS_INCDIR$ac_delim
INTEL_JITEVENTS_LIBDIR!$INTEL_JITEVENTS_LIBDIR$ac_delim INTEL_JITEVENTS_LIBDIR!$INTEL_JITEVENTS_LIBDIR$ac_delim
BUILD_FLAGS!$BUILD_FLAGS$ac_delim
HAVE_PTHREAD!$HAVE_PTHREAD$ac_delim 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
@ -22088,7 +22084,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _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` = 89; then
break break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5