Changeset 7aebcdaf in mainline

Timestamp:

2019-05-03T13:03:18Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

db8568a

Parents:

98e5a1a

git-author:

Jiri Svoboda <jiri@…> (2019-05-02 17:03:06)

git-committer:

Jiri Svoboda <jiri@…> (2019-05-03 13:03:18)

Message:

JMP_SLOT relocation should not care/warn about symbol size

Location:

uspace/lib/c/arch

Files:

• ppc32/src/rtld/reloc.c (modified) (1 diff)
• sparc64/src/rtld/reloc.c (modified) (1 diff)

uspace/lib/c/arch/ppc32/src/rtld/reloc.c

@@ -240 +240 @@
                         }
 
-                        sym_size = sym->st_size;
-                        if (sym_size != sym_def->st_size) {
-#if 0
-                                printf("Warning: Mismatched symbol sizes.\n");
-#endif
-                                /* Take the lower value. */
-                                if (sym_size > sym_def->st_size)
-                                        sym_size = sym_def->st_size;
-                        }
-
                         DPRINTF("sym_addr = 0x%zx\n", sym_addr);
                         DPRINTF("r_offset=0x%zx\n", r_offset);

uspace/lib/c/arch/sparc64/src/rtld/reloc.c

@@ -206 +206 @@
                         }
 
-                        sym_size = sym->st_size;
-                        if (sym_size != sym_def->st_size) {
-                                printf("Warning: Mismatched symbol sizes.\n");
-                                /* Take the lower value. */
-                                if (sym_size > sym_def->st_size)
-                                        sym_size = sym_def->st_size;
-                        }
-
                         DPRINTF("sym_addr = 0x%zx\n", sym_addr);
                         DPRINTF("r_offset=0x%zx\n", r_offset);