diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-04-06 22:16:11 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-04-06 22:16:11 +0000 |
| commit | f3a35f6e8b2cbb5f39769b05270aac282e829d22 (patch) | |
| tree | 78cde559c6281bbc966534e155a270ff1a1049b5 | |
| parent | 0146470a52fec944e2111b7a0d827728a5b5516d (diff) | |
| download | ppe42-gcc-f3a35f6e8b2cbb5f39769b05270aac282e829d22.tar.gz ppe42-gcc-f3a35f6e8b2cbb5f39769b05270aac282e829d22.zip | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112740 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/i386/linux.h | 1 | ||||
| -rw-r--r-- | gcc/config/kfreebsd-gnu.h | 8 | ||||
| -rw-r--r-- | gcc/config/knetbsd-gnu.h | 9 |
4 files changed, 20 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6ee11b544c3..f15b03e98bd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +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. + 2006-04-06 Jan Hubicka <jh@suse.cz> PR profile/20815 diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h index ec171353c33..7eb2395b6d9 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h @@ -99,6 +99,7 @@ Boston, MA 02110-1301, USA. */ /* 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" diff --git a/gcc/config/kfreebsd-gnu.h b/gcc/config/kfreebsd-gnu.h index 60cbefcd1a1..8c11ca50137 100644 --- a/gcc/config/kfreebsd-gnu.h +++ b/gcc/config/kfreebsd-gnu.h @@ -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 @@ Boston, MA 02110-1301, USA. */ } \ 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 diff --git a/gcc/config/knetbsd-gnu.h b/gcc/config/knetbsd-gnu.h index 72a3b8d20e3..e1ff325b87c 100644 --- a/gcc/config/knetbsd-gnu.h +++ b/gcc/config/knetbsd-gnu.h @@ -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 @@ Boston, MA 02110-1301, USA. */ } \ 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 |
