Message ID | 201107291747.p6THlib10035@catbert.cup.hp.com |
---|---|
State | New |
Headers | show |
Steve, > Index: gcc/configure.ac > =================================================================== > --- gcc/configure.ac (revision 176899) > +++ gcc/configure.ac (working copy) > @@ -3240,6 +3240,13 @@ > *-*-solaris2*) > gcc_cv_ld_static_dynamic=yes > ;; > + *-*-hpux*) > + if test x"$gnu_ld" = xno; then > + gcc_cv_ld_static_dynamic=yes > + gcc_cv_ld_static_option="-aarchive" > + gcc_cv_ld_dynamic_option="-adefault" > + fi > + ;; > esac > fi > fi just a nit, but could you keep the cases sorted alphabetically? Thanks. Rainer
On Fri, 2011-07-29 at 20:00 +0200, Rainer Orth wrote: > Steve, > > > Index: gcc/configure.ac > > =================================================================== > > --- gcc/configure.ac (revision 176899) > > +++ gcc/configure.ac (working copy) > > @@ -3240,6 +3240,13 @@ > > *-*-solaris2*) > > gcc_cv_ld_static_dynamic=yes > > ;; > > + *-*-hpux*) > > + if test x"$gnu_ld" = xno; then > > + gcc_cv_ld_static_dynamic=yes > > + gcc_cv_ld_static_option="-aarchive" > > + gcc_cv_ld_dynamic_option="-adefault" > > + fi > > + ;; > > esac > > fi > > fi > > just a nit, but could you keep the cases sorted alphabetically? > > Thanks. > Rainer I can do that. And add a comment line like the other entries have. Steve Ellcey sje@cup.hp.com
On 29-Jul-11, at 2:11 PM, Steve Ellcey wrote: > On Fri, 2011-07-29 at 20:00 +0200, Rainer Orth wrote: >> Steve, >> >>> Index: gcc/configure.ac >>> =================================================================== >>> --- gcc/configure.ac (revision 176899) >>> +++ gcc/configure.ac (working copy) >>> @@ -3240,6 +3240,13 @@ >>> *-*-solaris2*) >>> gcc_cv_ld_static_dynamic=yes >>> ;; >>> + *-*-hpux*) >>> + if test x"$gnu_ld" = xno; then >>> + gcc_cv_ld_static_dynamic=yes >>> + gcc_cv_ld_static_option="-aarchive" >>> + gcc_cv_ld_dynamic_option="-adefault" >>> + fi >>> + ;; >>> esac >>> fi >>> fi >> >> just a nit, but could you keep the cases sorted alphabetically? >> >> Thanks. >> Rainer > > I can do that. And add a comment line like the other entries have. The patch fixes the C++ build on HP-UX 11.11 for both 32 and 64-bit targets. The HP-UX parts are ok with above revision. Dave -- John David Anglin dave.anglin@bell.net
Index: config/unwind_ipinfo.m4 =================================================================== --- config/unwind_ipinfo.m4 (revision 176899) +++ config/unwind_ipinfo.m4 (working copy) @@ -34,4 +34,8 @@ if test x$have_unwind_getipinfo = xyes; then AC_DEFINE(HAVE_GETIPINFO, 1, [Define if _Unwind_GetIPInfo is available.]) fi + + if test x$with_system_libunwind = xyes; then + AC_DEFINE(USE_SYSTEM_LIBUNWIND, 1, [Define if using system unwind library.]) + fi ]) Index: gcc/configure.ac =================================================================== --- gcc/configure.ac (revision 176899) +++ gcc/configure.ac (working copy) @@ -3240,6 +3240,13 @@ *-*-solaris2*) gcc_cv_ld_static_dynamic=yes ;; + *-*-hpux*) + if test x"$gnu_ld" = xno; then + gcc_cv_ld_static_dynamic=yes + gcc_cv_ld_static_option="-aarchive" + gcc_cv_ld_dynamic_option="-adefault" + fi + ;; esac fi fi Index: gcc/gcc.c =================================================================== --- gcc/gcc.c (revision 176899) +++ gcc/gcc.c (working copy) @@ -1389,7 +1389,7 @@ "-lgcc", "-lgcc_eh" #ifdef USE_LIBUNWIND_EXCEPTIONS -# ifdef HAVE_LD_STATIC_DYNAMIC +# if defined(HAVE_LD_STATIC_DYNAMIC) && !defined(USE_SYSTEM_LIBUNWIND) " %{!static:" LD_STATIC_OPTION "} -lunwind" " %{!static:" LD_DYNAMIC_OPTION "}" # else