Patchwork update configury for FreeBSD 10 on gcc-4.6 branch

login
register
mail settings
Submitter Andreas Tobler
Date Nov. 19, 2011, 8:27 p.m.
Message ID <4EC81130.2060304@fgznet.ch>
Download mbox | patch
Permalink /patch/126612/
State New
Headers show

Comments

Andreas Tobler - Nov. 19, 2011, 8:27 p.m.
Hi all,

the below patch updates the configury to be able to build gcc-4.6 on 
FreeBSD 10.
I attach only the source files which have changed.

This is the list of affected files, I left libgo away since it is not 
clear to me how the configury is done there.

libtool.m4
libgomp/configure
libquadmath/configure
zlib/configure
libstdc++-v3/configure
libmudflap/configure
boehm-gc/configure
lto-plugin/configure
libjava/libltdl/configure
libjava/libltdl/acinclude.m4
libjava/configure.ac
libjava/classpath/configure
libjava/configure
gcc/configure
libobjc/configure
libgfortran/configure
libffi/configure
libssp/configure


The CL look like this.

2011-11-19  Andreas Tobler  <andreast@fgznet.ch>

	* libtool.m4: Additional FreeBSD 10 fixes.

2011-11-19  Andreas Tobler  <andreast@fgznet.ch>

	* configure: Regenerate.

Is this ok for 4.6 branch?

Thanks,
Andreas

      ;;
@@ -5669,7 +5669,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
Gerald Pfeifer - Nov. 19, 2011, 10:15 p.m.
On Sat, 19 Nov 2011, Andreas Tobler wrote:
> the below patch updates the configury to be able to build gcc-4.6 on 
> FreeBSD 10. I attach only the source files which have changed.

> libjava/libltdl/acinclude.m4

I don't see this one in your ChangeLog?

> Is this ok for 4.6 branch?

Merging upstream changes from libtool that unbreak bootstrap on a
primary platform and are completely specific and isolated to that
platform should always be fine.

You did not indicate how you tested it, but assuming a full bootstrap
and testsuite run (which platform exactly?) please go ahead.

Thanks!

> Index: libjava/configure.ac
> ===================================================================
> --- libjava/configure.ac	(revision 181511)
> +++ libjava/configure.ac	(working copy)
> @@ -1060,7 +1060,7 @@
>       *-*-cygwin*)
>  	# Don't set THREADLIBS here.  Cygwin doesn't have -lpthread.
>  	;;
> -     *-*-freebsd[[1234]]*)
> +     *-*-freebsd[[234]].*)
>  	# Before FreeBSD 5, it didn't have -lpthread (or any library which
>  	# merely adds pthread_* functions) but it does have a -pthread switch
>  	# which is required at link-time to select -lc_r *instead* of -lc.

This is a separate change from the libtool import, right?  Ever since

  2011-02-02  Gerald Pfeifer  <gerald@pfeifer.com>

        * config.gcc (*-*-freebsd[12], *-*-freebsd[12].*, *-*-freebsd*aout*):
        Move to the unsupported targets list.

GCC per se does not support FreeBSD 2.x any more.  On the libtool side,
we should stick with what we get from upstream.  For other things, like
the above, I suggest to remove both 1 and 2.

Can you also make the libjava change on trunk, copying java-patches@ ?

Gerald

Patch

Index: libtool.m4
===================================================================
--- libtool.m4	(revision 181511)
+++ libtool.m4	(working copy)
@@ -2273,7 +2273,7 @@ 
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
      *) objformat=elf ;;
      esac
    fi
@@ -2291,7 +2291,7 @@ 
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
-  freebsd2*)
+  freebsd2.*)
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -4804,7 +4804,7 @@ 
        ;;

      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
        _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs 
$deplibs $linker_flags'
        _LT_TAGVAR(hardcode_direct, $1)=yes
        _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5751,7 +5751,7 @@ 
          esac
          ;;

-      freebsd[[12]]*)
+      freebsd2.*)
          # C++ shared libraries reported to be fairly broken before
  	# switch to ELF
          _LT_TAGVAR(ld_shlibs, $1)=no
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac	(revision 181511)
+++ libjava/configure.ac	(working copy)
@@ -1060,7 +1060,7 @@ 
       *-*-cygwin*)
  	# Don't set THREADLIBS here.  Cygwin doesn't have -lpthread.
  	;;
-     *-*-freebsd[[1234]]*)
+     *-*-freebsd[[234]].*)
  	# Before FreeBSD 5, it didn't have -lpthread (or any library which
  	# merely adds pthread_* functions) but it does have a -pthread switch
  	# which is required at link-time to select -lc_r *instead* of -lc.
Index: libjava/libltdl/acinclude.m4
===================================================================
--- libjava/libltdl/acinclude.m4	(revision 181511)
+++ libjava/libltdl/acinclude.m4	(working copy)
@@ -1377,7 +1377,7 @@ 
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
-  freebsd2*)
+  freebsd2.*)
      shlibpath_overrides_runpath=yes
      ;;
    freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -3035,7 +3035,7 @@ 
  	;;
      esac
      ;;
-  freebsd[[12]]*)
+  freebsd2.*)
      # C++ shared libraries reported to be fairly broken before switch 
to ELF
      _LT_AC_TAGVAR(ld_shlibs, $1)=no