diff options
| author | Robert Millan <robertmh@gnu.org> | 2006-04-06 22:16:11 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2006-04-06 22:16:11 +0000 |
| commit | 8224ee206c7125ad57440cbe2f020024ae3f1e3f (patch) | |
| tree | 78cde559c6281bbc966534e155a270ff1a1049b5 /gcc/config | |
| parent | 1f651229f0be6227e64c20b8400cdba2ef8fa1d0 (diff) | |
| download | gcc-8224ee206c7125ad57440cbe2f020024ae3f1e3f.zip gcc-8224ee206c7125ad57440cbe2f020024ae3f1e3f.tar.gz gcc-8224ee206c7125ad57440cbe2f020024ae3f1e3f.tar.bz2 | |
linux.h: Add a comment to mark macros that are being overriden in config/k*bsd-gnu.h.
* 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.
From-SVN: r112740
Diffstat (limited to 'gcc/config')
| -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 |
3 files changed, 12 insertions, 6 deletions
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h index ec17135..7eb2395 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 60cbefc..8c11ca5 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 72a3b8d..e1ff325 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 |