This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH] i*68-*-kfreebsd-gnu regression
- From: Robert Millan <rmh at aybabtu dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: "Joseph S. Myers" <joseph at codesourcery dot com>
- Date: Sat, 11 Mar 2006 21:55:00 +0100
- Subject: Re: [PATCH] i*68-*-kfreebsd-gnu regression
- Organisation: free as in freedom
- References: <20060305113429.GA20895@localhost.localdomain> <Pine.LNX.4.64.0603051919580.3922@digraph.polyomino.org.uk> <20060305201527.GB22801@localhost.localdomain>
Hey. Someone could approve this?
On Sun, Mar 05, 2006 at 09:15:27PM +0100, Robert Millan wrote:
>
> It seems that commit r111235, which included:
>
> * config/i386/linux.h (DYNAMIC_LINKER): Rename to
> GLIBC_DYNAMIC_LINKER.
>
> broke i686-*-kfreebsd-gnu, because kfreebsd-gnu.h wasn't synced with the new
> name.
>
> Attached patch fixes it. It is tested with trunk and known to work. It does
> also add a small comment to prevent this from happening again.
>
> ChangeLog:
>
> 2006-03-05 Robert Millan <robertmh@gnu.org>
>
> * gcc/config/i386/linux.h: Add a comment to mark macros that are
> being overriden in config/k*bsd-gnu.h.
> * gcc/config/kfreebsd-gnu.h: Redefine GLIBC_DYNAMIC_LINKER instead of
> DYNAMIC_LINKER.
> * gcc/config/knetbsd-gnu.h: Ditto.
>
> Thanks,
>
> --
> Robert Millan
> 2006-03-05 Robert Millan <robertmh@gnu.org>
>
> * gcc/config/i386/linux.h: Add a comment to mark macros that are
> being overriden in config/k*bsd-gnu.h.
> * gcc/config/kfreebsd-gnu.h: Redefine GLIBC_DYNAMIC_LINKER instead of
> DYNAMIC_LINKER.
> * gcc/config/knetbsd-gnu.h: Ditto.
>
> Index: gcc/config/i386/linux.h
> ===================================================================
> --- gcc/config/i386/linux.h (revision 111710)
> +++ gcc/config/i386/linux.h (working copy)
> @@ -99,6 +99,7 @@
>
> /* If ELF is the default format, we should not use /lib/elf. */
>
> +/* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
> #define LINK_EMULATION "elf_i386"
> #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
>
> Index: gcc/config/kfreebsd-gnu.h
> ===================================================================
> --- gcc/config/kfreebsd-gnu.h (revision 111710)
> +++ gcc/config/kfreebsd-gnu.h (working copy)
> @@ -1,5 +1,5 @@
> /* Definitions for kFreeBSD-based GNU systems with ELF format
> - Copyright (C) 2004
> + Copyright (C) 2004, 2006
> Free Software Foundation, Inc.
> Contributed by Robert Millan.
>
> @@ -32,5 +32,7 @@
> } \
> while (0)
>
> -#undef DYNAMIC_LINKER
> -#define DYNAMIC_LINKER "/lib/ld.so.1"
> +#ifdef GLIBC_DYNAMIC_LINKER
> +#undef GLIBC_DYNAMIC_LINKER
> +#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
> +#endif
> Index: gcc/config/knetbsd-gnu.h
> ===================================================================
> --- gcc/config/knetbsd-gnu.h (revision 111710)
> +++ gcc/config/knetbsd-gnu.h (working copy)
> @@ -1,5 +1,5 @@
> /* Definitions for kNetBSD-based GNU systems with ELF format
> - Copyright (C) 2004
> + Copyright (C) 2004, 2006
> Free Software Foundation, Inc.
> Contributed by Robert Millan.
>
> @@ -32,5 +32,8 @@
> } \
> while (0)
>
> -#undef DYNAMIC_LINKER
> -#define DYNAMIC_LINKER "/lib/ld.so.1"
> +
> +#ifdef GLIBC_DYNAMIC_LINKER
> +#undef GLIBC_DYNAMIC_LINKER
> +#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
> +#endif
--
Robert Millan
<a href="http://linuxstolescocode.com/";>SCO</a> <a href="http://sco.com/";>losers</a><p>
<a href="http://www.whitehouse.gov/president/gwbbio.html";>miserable failure</a><p>