From 1da6c9fd87b4ea3946ad6d4c7ed4f32746e259c6 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Thu, 18 Dec 2003 20:12:52 +0000 Subject: [PATCH] sol2.h (LINK_ARCH32_SPEC): Define in terms of ... * config/sol2.h (LINK_ARCH32_SPEC): Define in terms of ... (LINK_ARCH32_SPEC_BASE): ... this new macro. * config/sparc/sol2-bi.h (LINK_ARCH64_SPEC): Define in terms of ... (LINK_ARCH64_SPEC_BASE): ... this new macro. * config/sparc/sol2-gld-bi.h (LINK_ARCH32_SPEC): New macro. (LINK_ARCH64_SPEC): Likewise. From-SVN: r74792 --- gcc/ChangeLog | 10 ++++++++++ gcc/config/sol2.h | 7 +++++-- gcc/config/sparc/sol2-bi.h | 4 +++- gcc/config/sparc/sol2-gld-bi.h | 9 +++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 135438cd5895..fad113e9d744 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2003-12-18 Mark Mitchell + + * config/sol2.h (LINK_ARCH32_SPEC): Define in terms of ... + (LINK_ARCH32_SPEC_BASE): ... this new macro. + * config/sparc/sol2-bi.h (LINK_ARCH64_SPEC): Define in terms of + ... + (LINK_ARCH64_SPEC_BASE): ... this new macro. + * config/sparc/sol2-gld-bi.h (LINK_ARCH32_SPEC): New macro. + (LINK_ARCH64_SPEC): Likewise. + 2003-12-17 Ulrich Weigand PR target/11992 diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h index c5980fbe1689..4b3ffb8c0171 100644 --- a/gcc/config/sol2.h +++ b/gcc/config/sol2.h @@ -114,8 +114,8 @@ Boston, MA 02111-1307, USA. */ #undef STARTFILE_ARCH_SPEC #define STARTFILE_ARCH_SPEC STARTFILE_ARCH32_SPEC -#undef LINK_ARCH32_SPEC -#define LINK_ARCH32_SPEC \ +#undef LINK_ARCH32_SPEC_BASE +#define LINK_ARCH32_SPEC_BASE \ "%{G:-G} \ %{YP,*} \ %{R*} \ @@ -127,6 +127,9 @@ Boston, MA 02111-1307, USA. */ %{!YP,*:%{p|pg:-Y P,/usr/ccs/lib/libp:/usr/lib/libp:/usr/ccs/lib:/usr/lib} \ %{!p:%{!pg:-Y P,/usr/ccs/lib:/usr/lib}}}}" +#undef LINK_ARCH32_SPEC +#define LINK_ARCH32_SPEC LINK_ARCH32_SPEC_BASE + #undef LINK_ARCH_SPEC #define LINK_ARCH_SPEC LINK_ARCH32_SPEC diff --git a/gcc/config/sparc/sol2-bi.h b/gcc/config/sparc/sol2-bi.h index 3f9416daaa09..f3bf160f6a5b 100644 --- a/gcc/config/sparc/sol2-bi.h +++ b/gcc/config/sparc/sol2-bi.h @@ -135,7 +135,7 @@ * This should be the same as in sol2.h, except with "/sparcv9" * appended to the paths and /usr/ccs/lib is no longer necessary */ -#define LINK_ARCH64_SPEC \ +#define LINK_ARCH64_SPEC_BASE \ "%{mcmodel=medlow:-M /usr/lib/ld/sparcv9/map.below4G} \ %{G:-G} \ %{YP,*} \ @@ -148,6 +148,8 @@ %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/sparcv9:/usr/lib/sparcv9} \ %{!p:%{!pg:-Y P,/usr/lib/sparcv9}}}}" +#define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE + #undef LINK_ARCH_SPEC #define LINK_ARCH_SPEC "\ %{m32:%(link_arch32)} \ diff --git a/gcc/config/sparc/sol2-gld-bi.h b/gcc/config/sparc/sol2-gld-bi.h index 81a1ff2395d1..0beae306f177 100644 --- a/gcc/config/sparc/sol2-gld-bi.h +++ b/gcc/config/sparc/sol2-gld-bi.h @@ -1,9 +1,18 @@ /* Definitions of target machine for GNU compiler, for bi-arch SPARC running Solaris 2 using the GNU linker. */ +#undef LINK_ARCH32_SPEC +#define LINK_ARCH32_SPEC \ + LINK_ARCH32_SPEC_BASE "%{!static: -rpath-link %R/usr/lib}" + +#undef LINK_ARCH64_SPEC +#define LINK_ARCH64_SPEC \ + LINK_ARCH64_SPEC_BASE "%{!static: -rpath-link %R/usr/lib/sparcv9}" + #undef LINK_ARCH_SPEC #define LINK_ARCH_SPEC "\ %{m32:-m elf32_sparc %(link_arch32)} \ %{m64:-m elf64_sparc %(link_arch64)} \ %{!m32:%{!m64:%(link_arch_default)}} \ " + -- 2.47.2