On Sun, 19 Apr 2009, Robert Watson wrote:
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.
This actually changes the line size used by the rtld code for pre-pthreads locking for several architectures. I think this is an improvement, but if architecture maintainers could comment on that, that would be helpful.
Robert N M Watson Computer Laboratory University of Cambridge
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 <sys/types.h> #include <machine/atomic.h> -#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 <sys/types.h> #include <machine/atomic.h> -#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 <sys/types.h> #include <machine/atomic.h> -#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 <sys/types.h> #include <machine/atomic.h> -#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 <sys/types.h> #include <machine/atomic.h> -#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 <sys/types.h> #include <machine/atomic.h> -#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 <sys/types.h> #include <machine/atomic.h> -#define CACHE_LINE_SIZE 128 - struct Struct_Obj_Entry; /* Return the address of the .dynamic section in the dynamic linker. */
_______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
