Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make _rtld_pagesz of type size_t. 

Fixes round_down for alpha which made ldd(1) break.
This commit is contained in:
skrll 2009-11-17 18:44:33 +00:00
parent 5fbc003349
commit 77fd7698f3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libexec/ld.elf_so/rtld.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtld.c,v 1.125 2009/09/24 21:21:34 pooka Exp $ */
/* $NetBSD: rtld.c,v 1.126 2009/11/17 18:44:33 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: rtld.c,v 1.125 2009/09/24 21:21:34 pooka Exp $");
__RCSID("$NetBSD: rtld.c,v 1.126 2009/11/17 18:44:33 skrll Exp $");
#endif /* not lint */
#include <err.h>
@ -92,7 +92,7 @@ Elf_Sym _rtld_sym_zero = {
.st_info = ELF_ST_INFO(STB_GLOBAL, STT_NOTYPE),
.st_shndx = SHN_ABS,
};
unsigned int _rtld_pagesz; /* Page size, as provided by kernel */
size_t _rtld_pagesz; /* Page size, as provided by kernel */
Search_Path *_rtld_default_paths;
Search_Path *_rtld_paths;

4
libexec/ld.elf_so/rtld.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtld.h,v 1.81 2009/09/24 21:21:34 pooka Exp $ */
/* $NetBSD: rtld.h,v 1.82 2009/11/17 18:44:33 skrll Exp $ */
/*
* Copyright 1996 John D. Polstra.
@ -51,7 +51,7 @@
#endif
#define _PATH_LD_HINTS "/etc/ld.so.conf"
extern unsigned int _rtld_pagesz;
extern size_t _rtld_pagesz;
#define round_down(x) ((x) & ~(_rtld_pagesz - 1))
#define round_up(x) round_down((x) + _rtld_pagesz - 1)

6
usr.bin/ldd/ldd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ldd.c,v 1.10 2009/09/07 17:56:52 dholland Exp $ */
/* $NetBSD: ldd.c,v 1.11 2009/11/17 18:44:33 skrll Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -62,7 +62,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: ldd.c,v 1.10 2009/09/07 17:56:52 dholland Exp $");
__RCSID("$NetBSD: ldd.c,v 1.11 2009/11/17 18:44:33 skrll Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -93,7 +93,7 @@ Obj_Entry *_rtld_objlist; /* Head of linked list of shared objects */
Obj_Entry **_rtld_objtail = &_rtld_objlist;
/* Link field of last object in list */
Obj_Entry *_rtld_objmain; /* The main program shared object */
unsigned int _rtld_pagesz;
size_t _rtld_pagesz;
Search_Path *_rtld_default_paths;
Search_Path *_rtld_paths;