Module Name: src Committed By: skrll Date: Tue Nov 17 18:44:33 UTC 2009
Modified Files: src/libexec/ld.elf_so: rtld.c rtld.h src/usr.bin/ldd: ldd.c Log Message: Make _rtld_pagesz of type size_t. Fixes round_down for alpha which made ldd(1) break. To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/libexec/ld.elf_so/rtld.c cvs rdiff -u -r1.81 -r1.82 src/libexec/ld.elf_so/rtld.h cvs rdiff -u -r1.10 -r1.11 src/usr.bin/ldd/ldd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/libexec/ld.elf_so/rtld.c diff -u src/libexec/ld.elf_so/rtld.c:1.125 src/libexec/ld.elf_so/rtld.c:1.126 --- src/libexec/ld.elf_so/rtld.c:1.125 Thu Sep 24 21:21:34 2009 +++ src/libexec/ld.elf_so/rtld.c Tue Nov 17 18:44:33 2009 @@ -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 @@ .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; Index: src/libexec/ld.elf_so/rtld.h diff -u src/libexec/ld.elf_so/rtld.h:1.81 src/libexec/ld.elf_so/rtld.h:1.82 --- src/libexec/ld.elf_so/rtld.h:1.81 Thu Sep 24 21:21:34 2009 +++ src/libexec/ld.elf_so/rtld.h Tue Nov 17 18:44:33 2009 @@ -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) Index: src/usr.bin/ldd/ldd.c diff -u src/usr.bin/ldd/ldd.c:1.10 src/usr.bin/ldd/ldd.c:1.11 --- src/usr.bin/ldd/ldd.c:1.10 Mon Sep 7 17:56:52 2009 +++ src/usr.bin/ldd/ldd.c Tue Nov 17 18:44:33 2009 @@ -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_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;