Skip to content

Commit

Permalink
knetbsd/kfreebsd patches from Robert Millan.
Browse files Browse the repository at this point in the history
* libtool.m4: Add kfreebsd*-gnu and knetbsd*-gnu.
* ltconfig: Likewise.
* ltcf-c.sh: Likewise.
* ltcf-cxx.sh: Likewise.
* ltcf-gcj.sh: Likewise.
  • Loading branch information
jim-wilson committed Jul 21, 2004
1 parent 543613e commit 61edac0
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 11 deletions.
13 changes: 13 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
2004-07-19 Robert Millan <[email protected]>

Synced from gcc:

2004-04-26 Robert Millan <[email protected]>

Add patches from libtool CVS.
* libtool.m4: Add kfreebsd*-gnu and knetbsd*-gnu.
* ltconfig: Likewise.
* ltcf-c.sh: Likewise.
* ltcf-cxx.sh: Likewise.
* ltcf-gcj.sh: Likewise.

2004-07-12 Paolo Bonzini <[email protected]>

* configure.in: Add noconfigdirs for crx-*-*.
Expand Down
4 changes: 2 additions & 2 deletions libtool.m4
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ darwin* | rhapsody*)
esac
;;
freebsd* )
freebsd* | kfreebsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
Expand Down Expand Up @@ -645,7 +645,7 @@ linux-gnu*)
lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
;;
netbsd*)
netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
[lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
else
Expand Down
6 changes: 3 additions & 3 deletions ltcf-c.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ EOF
whole_archive_flag_spec='-all_load $convenience'
;;

netbsd*)
netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
Expand Down Expand Up @@ -409,7 +409,7 @@ else
;;

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd*)
freebsd* | kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
Expand Down Expand Up @@ -456,7 +456,7 @@ else
link_all_deplibs=yes
;;

netbsd*)
netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
Expand Down
6 changes: 3 additions & 3 deletions ltcf-cxx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ case $host_os in
# C++ shared libraries reported to be fairly broken before switch to ELF
ld_shlibs=no
;;
freebsd*)
freebsd* | kfreebsd*-gnu)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs=yes
Expand Down Expand Up @@ -404,7 +404,7 @@ case $host_os in
;;
esac
;;
netbsd*)
netbsd* | knetbsd*-gnu)
# NetBSD uses g++ - do we need to do anything?
;;
osf3*)
Expand Down Expand Up @@ -759,7 +759,7 @@ else
;;
esac
;;
freebsd*)
freebsd* | kfreebsd*-gnu)
# FreeBSD uses GNU C++
;;
gnu*)
Expand Down
6 changes: 3 additions & 3 deletions ltcf-gcj.sh
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ EOF
$CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
;;

netbsd*)
netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
Expand Down Expand Up @@ -402,7 +402,7 @@ else
;;

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd*)
freebsd* | kfreebsd*-gnu)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
Expand Down Expand Up @@ -433,7 +433,7 @@ else
link_all_deplibs=yes
;;

netbsd*)
netbsd* | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
Expand Down
11 changes: 11 additions & 0 deletions ltconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1164,6 +1164,17 @@ gnu*)
hardcode_into_libs=yes
;;

kfreebsd*-gnu | knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;

hpux9* | hpux10* | hpux11*)
# Give a soname corresponding to the major version so that dld.sl refuses to
# link against other versions.
Expand Down

0 comments on commit 61edac0

Please sign in to comment.