[llvm-commits] [llvm] r142995 - in /llvm/trunk: autoconf/ltmain.sh autoconf/m4/libtool.m4 configure include/llvm/Config/config.h.in projects/sample/autoconf/ltmain.sh projects/sample/autoconf/m4/libtool.m4
Eric Christopher
echristo at apple.com
Tue Oct 25 17:42:12 PDT 2011
Author: echristo
Date: Tue Oct 25 19:42:12 2011
New Revision: 142995
URL: http://llvm.org/viewvc/llvm-project?rev=142995&view=rev
Log:
Handle newer cases for freebsd which is approaching 10.0 and not 1.0.
Patch by Dimitry Andric!
Modified:
llvm/trunk/autoconf/ltmain.sh
llvm/trunk/autoconf/m4/libtool.m4
llvm/trunk/configure
llvm/trunk/include/llvm/Config/config.h.in
llvm/trunk/projects/sample/autoconf/ltmain.sh
llvm/trunk/projects/sample/autoconf/m4/libtool.m4
Modified: llvm/trunk/autoconf/ltmain.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/ltmain.sh?rev=142995&r1=142994&r2=142995&view=diff
==============================================================================
Binary files - no diff available.
Modified: llvm/trunk/autoconf/m4/libtool.m4
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/m4/libtool.m4?rev=142995&r1=142994&r2=142995&view=diff
==============================================================================
--- llvm/trunk/autoconf/m4/libtool.m4 (original)
+++ llvm/trunk/autoconf/m4/libtool.m4 Tue Oct 25 19:42:12 2011
@@ -1384,7 +1384,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1.*)
dynamic_linker=no
;;
@@ -1407,7 +1407,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -1425,7 +1425,7 @@
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -3099,7 +3099,7 @@
;;
esac
;;
- freebsd[[12]]*)
+ freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -5858,7 +5858,7 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
+ freebsd1.*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -5874,7 +5874,7 @@
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
Modified: llvm/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=142995&r1=142994&r2=142995&view=diff
==============================================================================
--- llvm/trunk/configure (original)
+++ llvm/trunk/configure Tue Oct 25 19:42:12 2011
@@ -1416,8 +1416,7 @@
--enable-targets Build specific host targets: all or
target1,target2,... Valid targets are: host, x86,
x86_64, sparc, powerpc, alpha, arm, mips, spu,
- xcore, msp430, ptx, cbe, and cpp
- (default=all)
+ xcore, msp430, ptx, cbe, and cpp (default=all)
--enable-cbe-printf-a Enable C Backend output with hex floating point via
%a (default is YES)
--enable-bindings Build specific language bindings:
@@ -8906,7 +8905,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1.*)
dynamic_linker=no
;;
@@ -8929,7 +8928,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[123].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -8947,7 +8946,7 @@
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10461,7 +10460,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10474 "configure"
+#line 10463 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -21060,6 +21059,7 @@
ac_config_files="$ac_config_files Makefile.config"
+
ac_config_files="$ac_config_files llvm.spec"
@@ -21072,8 +21072,10 @@
ac_config_files="$ac_config_files tools/llvm-config/llvm-config.in"
+
ac_config_files="$ac_config_files bindings/ocaml/llvm/META.llvm"
+
ac_config_commands="$ac_config_commands setup"
ac_config_commands="$ac_config_commands Makefile"
@@ -21691,6 +21693,7 @@
"docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;;
"tools/clang/docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES tools/clang/docs/doxygen.cfg" ;;
"tools/llvm-config/llvm-config.in") CONFIG_FILES="$CONFIG_FILES tools/llvm-config/llvm-config.in" ;;
+ "bindings/ocaml/llvm/META.llvm") CONFIG_FILES="$CONFIG_FILES bindings/ocaml/llvm/META.llvm" ;;
"setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
"Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
"Makefile.common") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;;
Modified: llvm/trunk/include/llvm/Config/config.h.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.in?rev=142995&r1=142994&r2=142995&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Config/config.h.in (original)
+++ llvm/trunk/include/llvm/Config/config.h.in Tue Oct 25 19:42:12 2011
@@ -666,6 +666,9 @@
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
Modified: llvm/trunk/projects/sample/autoconf/ltmain.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/sample/autoconf/ltmain.sh?rev=142995&r1=142994&r2=142995&view=diff
==============================================================================
--- llvm/trunk/projects/sample/autoconf/ltmain.sh (original)
+++ llvm/trunk/projects/sample/autoconf/ltmain.sh Tue Oct 25 19:42:12 2011
@@ -4668,7 +4668,7 @@
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
case "$compile_command " in
*" -static "*) ;;
*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
Modified: llvm/trunk/projects/sample/autoconf/m4/libtool.m4
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/sample/autoconf/m4/libtool.m4?rev=142995&r1=142994&r2=142995&view=diff
==============================================================================
--- llvm/trunk/projects/sample/autoconf/m4/libtool.m4 (original)
+++ llvm/trunk/projects/sample/autoconf/m4/libtool.m4 Tue Oct 25 19:42:12 2011
@@ -1384,7 +1384,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1.*)
dynamic_linker=no
;;
@@ -1407,7 +1407,7 @@
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -1425,7 +1425,7 @@
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -3099,7 +3099,7 @@
;;
esac
;;
- freebsd[[12]]*)
+ freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -5858,7 +5858,7 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
+ freebsd1.*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -5874,7 +5874,7 @@
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
More information about the llvm-commits
mailing list