diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 92cb754a3c09f015ab197b35124e830071cfb4c1..ea832cb1888cddbbd7440422699dd93e91a5fb32 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-04-16 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + * pa64-hpux.h (LIB_SPEC): Fix library specification used with GNU ld. + 2004-04-16 Nick Clifton <nickc@redhat.com> * config/arm/arm.c (arm_override_options): Revert previous patch. diff --git a/gcc/config/pa/pa64-hpux.h b/gcc/config/pa/pa64-hpux.h index 592883262436f565f0a634958b9f72821048ae18..2ae031dc278452006724b1bebcc3e42155ac310a 100644 --- a/gcc/config/pa/pa64-hpux.h +++ b/gcc/config/pa/pa64-hpux.h @@ -63,6 +63,18 @@ Boston, MA 02111-1307, USA. */ isn't available. We also usually need to link with libdld and it's only available in shared form. */ #undef LIB_SPEC +#if ((TARGET_DEFAULT | TARGET_CPU_DEFAULT) & MASK_GNU_LD) +#define LIB_SPEC \ + "%{!shared:\ + %{!p:%{!pg: -lc %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\ + %{p:%{!pg:%{static:%{!mhp-ld:-a shared}%{mhp-ld:-a archive_shared}}\ + -lprof %{static:-a archive} -lc\ + %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\ + %{pg:%{static:%{!mhp-ld:-a shared}%{mhp-ld:-a archive_shared}}\ + -lgprof %{static:-a archive} -lc\ + %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\ + /usr/lib/pa20_64/milli.a" +#else #define LIB_SPEC \ "%{!shared:\ %{!p:%{!pg: -lc %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\ @@ -73,6 +85,7 @@ Boston, MA 02111-1307, USA. */ -lgprof %{static:-a archive} -lc\ %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\ /usr/lib/pa20_64/milli.a" +#endif /* Under hpux11, the normal location of the `ld' and `as' programs is the /usr/ccs/bin directory. */