RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-24 20:29:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle newer cases for freebsd which is approaching 10.0 and not 1.0.

Browse Source 
Patch by Dimitry Andric!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142995 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2011-10-26 00:42:12 +00:00
parent 5289142cc8
commit 360fa9a29d
6 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoconf/ltmain.sh
View File

@ -4668,7 +4668,7 @@ static const void *lt_preloaded_setup() {
# linked before any other PIC object. But we must not use # linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in # pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. # 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 case "$compile_command " in
*" -static "*) ;; *" -static "*) ;;
*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;

12
autoconf/m4/libtool.m4 vendored
View File

@ -1384,7 +1384,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
;; ;;
freebsd1*) freebsd1.*)
dynamic_linker=no dynamic_linker=no
;; ;;
@ -1407,7 +1407,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat` objformat=`/usr/bin/objformat`
else else
case $host_os in case $host_os in
freebsd[[123]]*) objformat=aout ;; freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;; *) objformat=elf ;;
esac esac
fi fi
@ -1425,7 +1425,7 @@ freebsd* | dragonfly*)
esac esac
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
case $host_os in case $host_os in
freebsd2*) freebsd2.*)
shlibpath_overrides_runpath=yes shlibpath_overrides_runpath=yes
;; ;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*) freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@ -3099,7 +3099,7 @@ case $host_os in
;; ;;
esac esac
;; ;;
freebsd[[12]]*) freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before switch to ELF # C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no _LT_AC_TAGVAR(ld_shlibs, $1)=no
;; ;;
@ -5858,7 +5858,7 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;; ;;
freebsd1*) freebsd1.*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no _LT_AC_TAGVAR(ld_shlibs, $1)=no
;; ;;
@ -5874,7 +5874,7 @@ _LT_EOF
;; ;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature. # 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(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes

15
configure vendored
View File

@ -1416,8 +1416,7 @@ Optional Features:
--enable-targets Build specific host targets: all or --enable-targets Build specific host targets: all or
target1,target2,... Valid targets are: host, x86, target1,target2,... Valid targets are: host, x86,
x86_64, sparc, powerpc, alpha, arm, mips, spu, x86_64, sparc, powerpc, alpha, arm, mips, spu,
xcore, msp430, ptx, cbe, and cpp xcore, msp430, ptx, cbe, and cpp (default=all)
(default=all)
--enable-cbe-printf-a Enable C Backend output with hex floating point via --enable-cbe-printf-a Enable C Backend output with hex floating point via
%a (default is YES) %a (default is YES)
--enable-bindings Build specific language bindings: --enable-bindings Build specific language bindings:
@ -8906,7 +8905,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
;; ;;
freebsd1*) freebsd1.*)
dynamic_linker=no dynamic_linker=no
;; ;;
@ -8929,7 +8928,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat` objformat=`/usr/bin/objformat`
else else
case $host_os in case $host_os in
freebsd[123]*) objformat=aout ;; freebsd[123].*) objformat=aout ;;
*) objformat=elf ;; *) objformat=elf ;;
esac esac
fi fi
@ -8947,7 +8946,7 @@ freebsd* | dragonfly*)
esac esac
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
case $host_os in case $host_os in
freebsd2*) freebsd2.*)
shlibpath_overrides_runpath=yes shlibpath_overrides_runpath=yes
;; ;;
freebsd3.[01]* | freebsdelf3.[01]*) freebsd3.[01]* | freebsdelf3.[01]*)
@ -10461,7 +10460,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 10474 "configure" #line 10463 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -21060,6 +21059,7 @@ ac_config_headers="$ac_config_headers include/llvm/Support/DataTypes.h"
ac_config_files="$ac_config_files Makefile.config" ac_config_files="$ac_config_files Makefile.config"
ac_config_files="$ac_config_files llvm.spec" ac_config_files="$ac_config_files llvm.spec"
@ -21072,8 +21072,10 @@ fi
ac_config_files="$ac_config_files tools/llvm-config/llvm-config.in" 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_files="$ac_config_files bindings/ocaml/llvm/META.llvm"
ac_config_commands="$ac_config_commands setup" ac_config_commands="$ac_config_commands setup"
ac_config_commands="$ac_config_commands Makefile" ac_config_commands="$ac_config_commands Makefile"
@ -21691,6 +21693,7 @@ do
"docs/doxygen.cfg") CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;; "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/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" ;; "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" ;; "setup") CONFIG_COMMANDS="$CONFIG_COMMANDS setup" ;;
"Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
"Makefile.common") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;; "Makefile.common") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;;

3
include/llvm/Config/config.h.in
View File

@ -666,6 +666,9 @@
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN #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>. */ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME #undef TIME_WITH_SYS_TIME

2
projects/sample/autoconf/ltmain.sh
View File

@ -4668,7 +4668,7 @@ static const void *lt_preloaded_setup() {
# linked before any other PIC object. But we must not use # linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in # pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. # 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 case "$compile_command " in
*" -static "*) ;; *" -static "*) ;;
*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;

12
projects/sample/autoconf/m4/libtool.m4 vendored
View File

@ -1384,7 +1384,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
;; ;;
freebsd1*) freebsd1.*)
dynamic_linker=no dynamic_linker=no
;; ;;
@ -1407,7 +1407,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat` objformat=`/usr/bin/objformat`
else else
case $host_os in case $host_os in
freebsd[[123]]*) objformat=aout ;; freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;; *) objformat=elf ;;
esac esac
fi fi
@ -1425,7 +1425,7 @@ freebsd* | dragonfly*)
esac esac
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
case $host_os in case $host_os in
freebsd2*) freebsd2.*)
shlibpath_overrides_runpath=yes shlibpath_overrides_runpath=yes
;; ;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*) freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@ -3099,7 +3099,7 @@ case $host_os in
;; ;;
esac esac
;; ;;
freebsd[[12]]*) freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before switch to ELF # C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no _LT_AC_TAGVAR(ld_shlibs, $1)=no
;; ;;
@ -5858,7 +5858,7 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;; ;;
freebsd1*) freebsd1.*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no _LT_AC_TAGVAR(ld_shlibs, $1)=no
;; ;;
@ -5874,7 +5874,7 @@ _LT_EOF
;; ;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature. # 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(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes