From owner-svn-src-all@FreeBSD.ORG Sun Apr 19 23:02:51 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35325106566B; Sun, 19 Apr 2009 23:02:51 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 190AE8FC13; Sun, 19 Apr 2009 23:02:51 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3JN2oEm023226; Sun, 19 Apr 2009 23:02:50 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3JN2o6Z023217; Sun, 19 Apr 2009 23:02:50 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200904192302.n3JN2o6Z023217@svn.freebsd.org> From: Robert Watson Date: Sun, 19 Apr 2009 23:02:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191291 - in head: lib/libthr/thread libexec/rtld-elf/amd64 libexec/rtld-elf/arm libexec/rtld-elf/i386 libexec/rtld-elf/ia64 libexec/rtld-elf/mips libexec/rtld-elf/powerpc libexec/rtld-... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Apr 2009 23:02:51 -0000 Author: rwatson Date: Sun Apr 19 23:02:50 2009 New Revision: 191291 URL: http://svn.freebsd.org/changeset/base/191291 Log: Now that the kernel defines CACHE_LINE_SIZE in machine/param.h, use that definition in the custom locking code for the run-time linker rather than local definitions. Pointed out by: tinderbox MFC after: 2 weeks Modified: head/lib/libthr/thread/thr_rtld.c head/libexec/rtld-elf/amd64/rtld_machdep.h head/libexec/rtld-elf/arm/rtld_machdep.h head/libexec/rtld-elf/i386/rtld_machdep.h head/libexec/rtld-elf/ia64/rtld_machdep.h head/libexec/rtld-elf/mips/rtld_machdep.h head/libexec/rtld-elf/powerpc/rtld_machdep.h head/libexec/rtld-elf/sparc64/rtld_machdep.h Modified: head/lib/libthr/thread/thr_rtld.c ============================================================================== --- head/lib/libthr/thread/thr_rtld.c Sun Apr 19 22:58:36 2009 (r191290) +++ head/lib/libthr/thread/thr_rtld.c Sun Apr 19 23:02:50 2009 (r191291) @@ -39,8 +39,6 @@ #undef errno extern int errno; -#define CACHE_LINE_SIZE 64 - static int _thr_rtld_clr_flag(int); static void *_thr_rtld_lock_create(void); static void _thr_rtld_lock_destroy(void *); Modified: head/libexec/rtld-elf/amd64/rtld_machdep.h ============================================================================== --- head/libexec/rtld-elf/amd64/rtld_machdep.h Sun Apr 19 22:58:36 2009 (r191290) +++ head/libexec/rtld-elf/amd64/rtld_machdep.h Sun Apr 19 23:02:50 2009 (r191291) @@ -32,8 +32,6 @@ #include #include -#define CACHE_LINE_SIZE 64 - struct Struct_Obj_Entry; /* Return the address of the .dynamic section in the dynamic linker. */ Modified: head/libexec/rtld-elf/arm/rtld_machdep.h ============================================================================== --- head/libexec/rtld-elf/arm/rtld_machdep.h Sun Apr 19 22:58:36 2009 (r191290) +++ head/libexec/rtld-elf/arm/rtld_machdep.h Sun Apr 19 23:02:50 2009 (r191291) @@ -32,8 +32,6 @@ #include #include -#define CACHE_LINE_SIZE 32 - struct Struct_Obj_Entry; /* Return the address of the .dynamic section in the dynamic linker. */ Modified: head/libexec/rtld-elf/i386/rtld_machdep.h ============================================================================== --- head/libexec/rtld-elf/i386/rtld_machdep.h Sun Apr 19 22:58:36 2009 (r191290) +++ head/libexec/rtld-elf/i386/rtld_machdep.h Sun Apr 19 23:02:50 2009 (r191291) @@ -32,8 +32,6 @@ #include #include -#define CACHE_LINE_SIZE 32 - struct Struct_Obj_Entry; /* Return the address of the .dynamic section in the dynamic linker. */ Modified: head/libexec/rtld-elf/ia64/rtld_machdep.h ============================================================================== --- head/libexec/rtld-elf/ia64/rtld_machdep.h Sun Apr 19 22:58:36 2009 (r191290) +++ head/libexec/rtld-elf/ia64/rtld_machdep.h Sun Apr 19 23:02:50 2009 (r191291) @@ -32,8 +32,6 @@ #include #include -#define CACHE_LINE_SIZE 128 - /* * Macros for cracking ia64 function pointers. */ Modified: head/libexec/rtld-elf/mips/rtld_machdep.h ============================================================================== --- head/libexec/rtld-elf/mips/rtld_machdep.h Sun Apr 19 22:58:36 2009 (r191290) +++ head/libexec/rtld-elf/mips/rtld_machdep.h Sun Apr 19 23:02:50 2009 (r191291) @@ -32,8 +32,6 @@ #include #include -#define CACHE_LINE_SIZE 32 - struct Struct_Obj_Entry; /* Return the address of the .dynamic section in the dynamic linker. */ Modified: head/libexec/rtld-elf/powerpc/rtld_machdep.h ============================================================================== --- head/libexec/rtld-elf/powerpc/rtld_machdep.h Sun Apr 19 22:58:36 2009 (r191290) +++ head/libexec/rtld-elf/powerpc/rtld_machdep.h Sun Apr 19 23:02:50 2009 (r191291) @@ -32,8 +32,6 @@ #include #include -#define CACHE_LINE_SIZE 32 - struct Struct_Obj_Entry; /* Return the address of the .dynamic section in the dynamic linker. */ Modified: head/libexec/rtld-elf/sparc64/rtld_machdep.h ============================================================================== --- head/libexec/rtld-elf/sparc64/rtld_machdep.h Sun Apr 19 22:58:36 2009 (r191290) +++ head/libexec/rtld-elf/sparc64/rtld_machdep.h Sun Apr 19 23:02:50 2009 (r191291) @@ -32,8 +32,6 @@ #include #include -#define CACHE_LINE_SIZE 128 - struct Struct_Obj_Entry; /* Return the address of the .dynamic section in the dynamic linker. */