Page MenuHomeFreeBSD
Files F102897764

D33345.diff
No OneTemporary
Actions

D33345.diff
View Options

diff --git a/lib/libthr/arch/aarch64/include/pthread_md.h b/lib/libthr/arch/aarch64/include/pthread_md.h
--- a/lib/libthr/arch/aarch64/include/pthread_md.h
+++ b/lib/libthr/arch/aarch64/include/pthread_md.h
@@ -38,10 +38,8 @@
#include <sys/types.h>
#include <machine/sysarch.h>
-#include <stddef.h>
#define CPU_SPINWAIT
-#define DTV_OFFSET offsetof(struct tcb, tcb_dtv)
/*
* Variant I tcb. The structure layout is fixed, don't blindly
diff --git a/lib/libthr/arch/amd64/include/pthread_md.h b/lib/libthr/arch/amd64/include/pthread_md.h
--- a/lib/libthr/arch/amd64/include/pthread_md.h
+++ b/lib/libthr/arch/amd64/include/pthread_md.h
@@ -41,8 +41,6 @@
#define CPU_SPINWAIT __asm __volatile("pause")
-#define DTV_OFFSET offsetof(struct tcb, tcb_dtv)
-
/*
* Variant II tcb, first two members are required by rtld,
* %fs points to the structure.
diff --git a/lib/libthr/arch/arm/include/pthread_md.h b/lib/libthr/arch/arm/include/pthread_md.h
--- a/lib/libthr/arch/arm/include/pthread_md.h
+++ b/lib/libthr/arch/arm/include/pthread_md.h
@@ -36,10 +36,8 @@
#include <sys/types.h>
#include <machine/sysarch.h>
-#include <stddef.h>
#define CPU_SPINWAIT
-#define DTV_OFFSET offsetof(struct tcb, tcb_dtv)
/*
* Variant I tcb. The structure layout is fixed, don't blindly
diff --git a/lib/libthr/arch/i386/include/pthread_md.h b/lib/libthr/arch/i386/include/pthread_md.h
--- a/lib/libthr/arch/i386/include/pthread_md.h
+++ b/lib/libthr/arch/i386/include/pthread_md.h
@@ -41,8 +41,6 @@
#define CPU_SPINWAIT __asm __volatile("pause")
-#define DTV_OFFSET offsetof(struct tcb, tcb_dtv)
-
/*
* Variant II tcb, first two members are required by rtld,
* %gs points to the structure.
diff --git a/lib/libthr/arch/mips/include/pthread_md.h b/lib/libthr/arch/mips/include/pthread_md.h
--- a/lib/libthr/arch/mips/include/pthread_md.h
+++ b/lib/libthr/arch/mips/include/pthread_md.h
@@ -38,10 +38,8 @@
#include <sys/types.h>
#include <machine/sysarch.h>
#include <machine/tls.h>
-#include <stddef.h>
#define CPU_SPINWAIT
-#define DTV_OFFSET offsetof(struct tcb, tcb_dtv)
/*
* Variant I tcb. The structure layout is fixed, don't blindly
diff --git a/lib/libthr/arch/powerpc/include/pthread_md.h b/lib/libthr/arch/powerpc/include/pthread_md.h
--- a/lib/libthr/arch/powerpc/include/pthread_md.h
+++ b/lib/libthr/arch/powerpc/include/pthread_md.h
@@ -35,12 +35,10 @@
#ifndef _PTHREAD_MD_H_
#define _PTHREAD_MD_H_
-#include <stddef.h>
#include <sys/types.h>
#define CPU_SPINWAIT
-#define DTV_OFFSET offsetof(struct tcb, tcb_dtv)
#ifdef __powerpc64__
#define TP_OFFSET 0x7010
#else
diff --git a/lib/libthr/arch/riscv/include/pthread_md.h b/lib/libthr/arch/riscv/include/pthread_md.h
--- a/lib/libthr/arch/riscv/include/pthread_md.h
+++ b/lib/libthr/arch/riscv/include/pthread_md.h
@@ -42,10 +42,8 @@
#define _PTHREAD_MD_H_
#include <sys/types.h>
-#include <stddef.h>
#define CPU_SPINWAIT
-#define DTV_OFFSET offsetof(struct tcb, tcb_dtv)
#define TP_OFFSET sizeof(struct tcb)
/*
diff --git a/lib/libthr/thread/thr_symbols.c b/lib/libthr/thread/thr_symbols.c
--- a/lib/libthr/thread/thr_symbols.c
+++ b/lib/libthr/thread/thr_symbols.c
@@ -55,7 +55,7 @@
int _thread_off_key_allocated = offsetof(struct pthread_key, allocated);
int _thread_off_key_destructor = offsetof(struct pthread_key, destructor);
int _thread_max_keys = PTHREAD_KEYS_MAX;
-int _thread_off_dtv = DTV_OFFSET;
+int _thread_off_dtv = offsetof(struct tcb, tcb_dtv);
int _thread_off_state = offsetof(struct pthread, state);
int _thread_state_running = PS_RUNNING;
int _thread_state_zoombie = PS_DEAD;

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 19, 11:30 AM (21 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14715682
Default Alt Text
D33345.diff (3 KB)

Event Timeline