From 6148be0f229913f22a8e3681320055b986ce4e83 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 13 Feb 2011 21:00:08 +0000 Subject: [PATCH] Remove freebsd1 from libtool.m4 macros and config.rpath. /: Import from Libtool and gnulib: 2011-01-27 Gerald Pfeifer Prepare for supporting FreeBSD 10. * config.rpath: Remove handling of freebsd1* which soon would match FreeBSD 10.0. 2011-01-20 Gerald Pfeifer (tiny change) Remove support for FreeBSD 1.x. * libtool.m4 (_LT_LINKER_SHLIBS) (_LT_SYS_DYNAMIC_LINKER): Remove handling of freebsd1* which soon would incorrectly match FreeBSD 10.0. bfd/: * configure: Regenerate. gas/: * configure: Regenerate. ld/: * configure: Regenerate. opcodes/: * configure: Regenerate. binutils/: * configure: Regenerate. gprof/: * configure: Regenerate. --- ChangeLog | 17 +++++++++++++++++ config.rpath | 5 ----- libtool.m4 | 8 -------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 930f70d09..9f4591db7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2011-02-13 Ralf Wildenhues + + Import from Libtool and gnulib: + + 2011-01-27 Gerald Pfeifer + + Prepare for supporting FreeBSD 10. + * config.rpath: Remove handling of freebsd1* which soon would + match FreeBSD 10.0. + + 2011-01-20 Gerald Pfeifer (tiny change) + + Remove support for FreeBSD 1.x. + * libtool.m4 (_LT_LINKER_SHLIBS) + (_LT_SYS_DYNAMIC_LINKER): Remove handling of freebsd1* which + soon would incorrectly match FreeBSD 10.0. + 2011-02-12 Ralf Wildenhues PR binutils/12283 diff --git a/config.rpath b/config.rpath index 9316b9197..4dea75957 100755 --- a/config.rpath +++ b/config.rpath @@ -284,9 +284,6 @@ else dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd1*) - ld_shlibs=no - ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -448,8 +445,6 @@ case "$host_os" in ;; dgux*) ;; - freebsd1*) - ;; freebsd*) ;; gnu*) diff --git a/libtool.m4 b/libtool.m4 index 9abd14783..71bcee83c 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -2266,10 +2266,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -4796,10 +4792,6 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little