Hi! On Mon, 25 Jun 2012 18:19:26 +0200, Matthias Klose <d...@ubuntu.com> wrote: > On 25.06.2012 15:56, Joseph S. Myers wrote: > > On Mon, 25 Jun 2012, Matthias Klose wrote: > > > >> Please find attached the patch updated for trunk 20120625, x86 only, > >> tested on > >> x86-linux-gnu, KFreeBSD and the Hurd.
> 2012-06-25 Matthias Klose <d...@ubuntu.com>
>
> * doc/invoke.texi: Document -print-multiarch.
> * doc/install.texi: Document --enable-multiarch.
> * doc/fragments.texi: Document MULTILIB_OSDIRNAMES, MULTIARCH_DIRNAME.
> * configure.ac: Add --enable-multiarch option.
> * configure.in: Regenerate.
> * Makefile.in (s-mlib): Pass MULTIARCH_DIRNAME to genmultilib.
> enable_multiarch, with_float: New macros.
> if_multiarch: New macro, define in terms of enable_multiarch.
> * genmultilib: Add new argument for the multiarch name.
> * gcc.c (multiarch_dir): Define.
> (for_each_path): Search for multiarch suffixes.
> (driver_handle_option): Handle multiarch option.
> (do_spec_1): Pass -imultiarch if defined.
> (main): Print multiarch.
> (set_multilib_dir): Separate multilib and multiarch names
> from multilib_select.
> (print_multilib_info): Ignore multiarch names in multilib_select.
> * incpath.c (add_standard_paths): Search the multiarch include dirs.
> * cppdeault.h (default_include): Document multiarch in multilib
> member.
> * cppdefault.c: [LOCAL_INCLUDE_DIR, STANDARD_INCLUDE_DIR] Add an
> include directory for multiarch directories.
> * common.opt: New options --print-multiarch and -imultilib.
> * config.gcc: Add tmake fragments to tmake_file ( i386/t-kfreebsd
> for i[34567]86-*-kfreebsd*-gnu and x86_64-*-kfreebsd*-gnu, i386/t-gnu
> for i[34567]86-*-gnu*).
> * config/i386/t-kfreebsd: Add multiarch names in
> MULTILIB_OSDIRNAMES, define MULTIARCH_DIRNAME.
> * config/i386/t-linux64: Likewise.
> * config/i386/t-linux: Define MULTIARCH_DIRNAME.
> * config/i386/t-gnu: Likewise.
As I said before, »config/i386/t-{gnu,kfreebsd,linux}« are new files.
Instead of repeating: my comments from
<http://news.gmane.org/find-root.php?message_id=%3C87zk94cg1h.fsf%40schwinge.name%3E>
as well as the follow-up still hold.
> Index: genmultilib
> ===================================================================
> --- genmultilib (revision 188931)
> +++ genmultilib (working copy)
> @@ -84,6 +84,8 @@
> # This argument can be used together with MULTILIB_EXCEPTIONS and will take
> # effect after the MULTILIB_EXCEPTIONS.
>
> +# The optional eight argument is the multiarch name.
»ninth argument«.
Grüße,
Thomas
pgpZRoJXMiArK.pgp
Description: PGP signature
