[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: oo 1.1 beta2



Hi Jan,

Does your version of glibc-2.3.2 have the following changes in them from 
glibc-2.3.1?  These were the only changes from glibc-2.3.1 that existed and 
they need to be there to fix a limit on the total number of symbols that can 
be relocated.

Kevin

--- dl-runtime.c        2002-09-18 14:49:18.000000000 -0400
+++ ../../glibc-2.3.2/elf/dl-runtime.c  2003-02-07 14:41:12.000000000 -0500
@@ -1,5 +1,5 @@
 /* On-demand PLT fixup for shared objects.
-   Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or
@@ -84,7 +84,7 @@
          {
            const ElfW(Half) *vernum =
              (const void *) D_PTR (l, l_info[VERSYMIDX (DT_VERSYM)]);
-           ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info) & 0x7fff];
+           ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info)] & 0x7fff;
            const struct r_found_version *version = &l->l_versions[ndx];

            if (version->hash != 0)
@@ -179,7 +179,7 @@
              {
                const ElfW(Half) *vernum =
                  (const void *) D_PTR (l,l_info[VERSYMIDX (DT_VERSYM)]);
-               ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info) & 0x7fff];
+               ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info)] & 0x7fff;
                const struct r_found_version *version = &l->l_versions[ndx];

                if (version->hash != 0)

On Friday 06 June 2003 15:30, Jan-Hendrik Palic wrote:
> Hoi ..
>
> On Fri, Jun 06, 2003 at 08:54:03PM +0200, Jan-Hendrik Palic wrote:
> >Hoi .. Jack ..
> >
> >On Thu, Jun 05, 2003 at 11:56:33AM -0400, Jack Howarth wrote:
> >>   How did your last attempt at building 1.1 beta2 turn out?
> >>Did upgrading to glibc 2.3.2-1 help resolve your build issues
> >>on debian ppc sid?
> >
> >Build was fine .. it ran through but I get at setup with binutils 2.13.90
> > and 2.14.x that:
> >
> >register uno component:
> > /mnt/develop/Debian/OpenOffice/package/openoffice.org1.1-1.1beta2/debian/
> >tmp//usr/lib/openoffice1.1/program/libdbu644lp.soInconsistency detected by
> > ld.so: dl-runtime.c: 75: fixup: Assertion `((reloc->r_info) & 0xff) ==
> > 21' failed!
> >
> >after press ctrl+c
> >
> >make: *** [debian/stampdir/setup] Interrupt
> >libtricks, when sending message: Invalid argument
> >libtricks, when sending message: Invalid argument
>
> I had a look at it and found this in libc-2.3.2 ...
> (it is not a binutilsprob .. ;) )
>
> ./glibc-2.3.2/elf/dl-runtime.c:
> 74:  /* Sanity check that we're really looking at a PLT relocation.  */
> 75:  assert (ELFW(R_TYPE)(reloc->r_info) == ELF_MACHINE_JMP_SLOT);
>
> Anyone has a hint, where to look for it?
>
> 	Thnx
> 			Jan



Reply to: