Skip to content

Commit

Permalink
libphobos: Synchronize libdruntime bindings with upstream druntime
Browse files Browse the repository at this point in the history 
Reviewed-on: dlang/druntime#3348

gcc/d/ChangeLog:

	* typeinfo.cc (TypeInfoVisitor::visit (TypeInfoDeclaration *)): Don't
	layout m_arg1 and m_arg2 fields.

libphobos/ChangeLog:

	* Makefile.in: Regenerate.
	* configure: Regenerate.
	* libdruntime/MERGE: Merge upstream druntime e4aae28e.
	* libdruntime/Makefile.am (DRUNTIME_DSOURCES): Refresh module list.
	(DRUNTIME_DSOURCES_BIONIC): Add core/sys/bionic/err.d.
	(DRUNTIME_DSOURCES_DARWIN): Add core/sys/darwin/err.d,
	core/sys/darwin/ifaddrs.d, core/sys/darwin/mach/nlist.d,
	core/sys/darwin/mach/stab.d, and core/sys/darwin/sys/attr.d.
	(DRUNTIME_DSOURCES_DRAGONFLYBSD): Add core/sys/dragonflybsd/err.d.
	(DRUNTIME_DSOURCES_FREEBSD): Add core/sys/freebsd/err.d.
	(DRUNTIME_DSOURCES_LINUX): Add core/sys/linux/err.d.
	(DRUNTIME_DSOURCES_NETBSD): Add core/sys/netbsd/err.d.
	(DRUNTIME_DSOURCES_OPENBSD): Add core/sys/openbsd/err.d.
	(DRUNTIME_DSOURCES_POSIX): Add core/sys/posix/locale.d,
	core/sys/posix/stdc/time.d, core/sys/posix/string.d, and
	core/sys/posix/strings.d.
	(DRUNTIME_DSOURCES_SOLARIS): Add core/sys/solaris/err.d.
	(DRUNTIME_DSOURCES_WINDOWS): Add core/sys/windows/sdkddkver.d,
	and core/sys/windows/stdc/time.d
	* libdruntime/Makefile.in: Regenerate.
	* libdruntime/gcc/sections/elf_shared.d (sizeofTLS): New function.
	* testsuite/libphobos.thread/fiber_guard_page.d: Use
	__traits(getMember) to get internal fields.
  • Loading branch information
@ibuclaw
ibuclaw committed Jan 30, 2021
1 parent accc5ba commit 92dd3e7
Show file tree
Hide file tree
Showing 344 changed files with 13,179 additions and 12,370 deletions.
16 changes: 0 additions & 16 deletions gcc/d/typeinfo.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1013,9 +1013,6 @@ class TypeInfoVisitor : public Visitor
void function(void*) xdtor;
void function(void*) xpostblit;
uint m_align;
version (X86_64)
TypeInfo m_arg1;
TypeInfo m_arg2;
immutable(void)* xgetRTInfo; */

void visit (TypeInfoStructDeclaration *d)
Expand Down Expand Up @@ -1091,19 +1088,6 @@ class TypeInfoVisitor : public Visitor
/* uint m_align; */
this->layout_field (build_integer_cst (ti->alignsize (), d_uint_type));

if (global.params.is64bit)
{
/* TypeInfo m_arg1; */
tree arg1type = (sd->arg1type) ? build_typeinfo (d->loc, sd->arg1type)
: null_pointer_node;
this->layout_field (arg1type);

/* TypeInfo m_arg2; */
tree arg2type = (sd->arg2type) ? build_typeinfo (d->loc, sd->arg2type)
: null_pointer_node;
this->layout_field (arg2type);
}

/* immutable(void)* xgetRTInfo; */
if (sd->getRTInfo)
this->layout_field (build_expr (sd->getRTInfo, true));
Expand Down
2 changes: 1 addition & 1 deletion libphobos/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@SET_MAKE@

# Makefile for the toplevel directory of the D Standard library.
# Copyright (C) 2006-2020 Free Software Foundation, Inc.
# Copyright (C) 2006-2021 Free Software Foundation, Inc.
#
# GCC is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions libphobos/configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11746,7 +11746,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11759 "configure"
#line 11749 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H
Expand Down Expand Up @@ -11852,7 +11852,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11865 "configure"
#line 11855 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H
Expand Down
2 changes: 1 addition & 1 deletion libphobos/libdruntime/MERGE
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0fe7974cf53b75db59461de2a3d6e53ce933d297
e4aae28e36c118f13e346a61af6c413aadd8e838

The first line of this file holds the git revision number of the last
merge done from the dlang/druntime repository.
157 changes: 76 additions & 81 deletions libphobos/libdruntime/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,10 @@ DRUNTIME_DSOURCES = core/atomic.d core/attribute.d core/bitop.d \
core/stdc/tgmath.d core/stdc/time.d core/stdc/wchar_.d \
core/stdc/wctype.d core/sync/barrier.d core/sync/condition.d \
core/sync/config.d core/sync/exception.d core/sync/mutex.d \
core/sync/rwmutex.d core/sync/semaphore.d core/thread.d core/time.d \
core/vararg.d gc/bits.d gc/config.d gc/gcinterface.d \
core/sync/rwmutex.d core/sync/semaphore.d core/thread/context.d \
core/thread/fiber.d core/thread/osthread.d core/thread/package.d \
core/thread/threadbase.d core/thread/threadgroup.d core/thread/types.d \
core/time.d core/vararg.d gc/bits.d gc/config.d gc/gcinterface.d \
gc/impl/conservative/gc.d gc/impl/manual/gc.d gc/os.d gc/pooltable.d \
gc/proxy.d gcc/attribute.d gcc/backtrace.d gcc/builtins.d gcc/deh.d \
gcc/emutls.d gcc/gthread.d gcc/sections/android.d \
Expand All @@ -191,44 +193,33 @@ DRUNTIME_DSOURCES = core/atomic.d core/attribute.d core/bitop.d \
rt/cast_.d rt/config.d rt/critical_.d rt/deh.d rt/dmain2.d \
rt/invariant.d rt/lifetime.d rt/memory.d rt/minfo.d rt/monitor_.d \
rt/obj.d rt/qsort.d rt/sections.d rt/switch_.d rt/tlsgc.d \
rt/typeinfo/ti_Acdouble.d rt/typeinfo/ti_Acfloat.d \
rt/typeinfo/ti_Acreal.d rt/typeinfo/ti_Adouble.d \
rt/typeinfo/ti_Afloat.d rt/typeinfo/ti_Ag.d rt/typeinfo/ti_Aint.d \
rt/typeinfo/ti_Along.d rt/typeinfo/ti_Areal.d rt/typeinfo/ti_Ashort.d \
rt/typeinfo/ti_C.d rt/typeinfo/ti_byte.d rt/typeinfo/ti_cdouble.d \
rt/typeinfo/ti_cent.d rt/typeinfo/ti_cfloat.d rt/typeinfo/ti_char.d \
rt/typeinfo/ti_creal.d rt/typeinfo/ti_dchar.d \
rt/typeinfo/ti_delegate.d rt/typeinfo/ti_double.d \
rt/typeinfo/ti_float.d rt/typeinfo/ti_idouble.d \
rt/typeinfo/ti_ifloat.d rt/typeinfo/ti_int.d rt/typeinfo/ti_ireal.d \
rt/typeinfo/ti_long.d rt/typeinfo/ti_n.d rt/typeinfo/ti_ptr.d \
rt/typeinfo/ti_real.d rt/typeinfo/ti_short.d rt/typeinfo/ti_ubyte.d \
rt/typeinfo/ti_ucent.d rt/typeinfo/ti_uint.d rt/typeinfo/ti_ulong.d \
rt/typeinfo/ti_ushort.d rt/typeinfo/ti_void.d rt/typeinfo/ti_wchar.d \
rt/util/array.d rt/util/container/array.d rt/util/container/common.d \
rt/util/container/hashtab.d rt/util/container/treap.d rt/util/random.d \
rt/util/typeinfo.d rt/util/utf.d

DRUNTIME_DSOURCES_STDCXX = core/stdcpp/exception.d \
core/stdcpp/typeinfo.d

DRUNTIME_DSOURCES_BIONIC = core/sys/bionic/fcntl.d \
core/sys/bionic/string.d core/sys/bionic/unistd.d
DRUNTIME_DSOURCES_BIONIC = core/sys/bionic/err.d \
core/sys/bionic/fcntl.d core/sys/bionic/string.d \
core/sys/bionic/unistd.d

DRUNTIME_DSOURCES_DARWIN = core/sys/darwin/crt_externs.d \
core/sys/darwin/dlfcn.d core/sys/darwin/execinfo.d \
core/sys/darwin/dlfcn.d core/sys/darwin/err.d \
core/sys/darwin/execinfo.d core/sys/darwin/ifaddrs.d \
core/sys/darwin/mach/dyld.d core/sys/darwin/mach/getsect.d \
core/sys/darwin/mach/kern_return.d core/sys/darwin/mach/loader.d \
core/sys/darwin/mach/port.d core/sys/darwin/mach/semaphore.d \
core/sys/darwin/mach/nlist.d core/sys/darwin/mach/port.d \
core/sys/darwin/mach/semaphore.d core/sys/darwin/mach/stab.d \
core/sys/darwin/mach/thread_act.d core/sys/darwin/netinet/in_.d \
core/sys/darwin/pthread.d core/sys/darwin/string.d \
core/sys/darwin/sys/cdefs.d core/sys/darwin/sys/event.d \
core/sys/darwin/sys/mman.d
core/sys/darwin/sys/attr.d core/sys/darwin/sys/cdefs.d \
core/sys/darwin/sys/event.d core/sys/darwin/sys/mman.d

DRUNTIME_DSOURCES_DRAGONFLYBSD = core/sys/dragonflybsd/dlfcn.d \
core/sys/dragonflybsd/execinfo.d core/sys/dragonflybsd/netinet/in_.d \
core/sys/dragonflybsd/pthread_np.d core/sys/dragonflybsd/string.d \
core/sys/dragonflybsd/sys/_bitset.d \
core/sys/dragonflybsd/err.d core/sys/dragonflybsd/execinfo.d \
core/sys/dragonflybsd/netinet/in_.d core/sys/dragonflybsd/pthread_np.d \
core/sys/dragonflybsd/string.d core/sys/dragonflybsd/sys/_bitset.d \
core/sys/dragonflybsd/sys/_cpuset.d core/sys/dragonflybsd/sys/cdefs.d \
core/sys/dragonflybsd/sys/elf.d core/sys/dragonflybsd/sys/elf32.d \
core/sys/dragonflybsd/sys/elf64.d \
Expand All @@ -238,19 +229,20 @@ DRUNTIME_DSOURCES_DRAGONFLYBSD = core/sys/dragonflybsd/dlfcn.d \
core/sys/dragonflybsd/time.d

DRUNTIME_DSOURCES_FREEBSD = core/sys/freebsd/config.d \
core/sys/freebsd/dlfcn.d core/sys/freebsd/execinfo.d \
core/sys/freebsd/netinet/in_.d core/sys/freebsd/pthread_np.d \
core/sys/freebsd/string.d core/sys/freebsd/sys/_bitset.d \
core/sys/freebsd/sys/_cpuset.d core/sys/freebsd/sys/cdefs.d \
core/sys/freebsd/sys/elf.d core/sys/freebsd/sys/elf32.d \
core/sys/freebsd/sys/elf64.d core/sys/freebsd/sys/elf_common.d \
core/sys/freebsd/sys/event.d core/sys/freebsd/sys/link_elf.d \
core/sys/freebsd/sys/mman.d core/sys/freebsd/sys/mount.d \
core/sys/freebsd/time.d core/sys/freebsd/unistd.d
core/sys/freebsd/dlfcn.d core/sys/freebsd/err.d \
core/sys/freebsd/execinfo.d core/sys/freebsd/netinet/in_.d \
core/sys/freebsd/pthread_np.d core/sys/freebsd/string.d \
core/sys/freebsd/sys/_bitset.d core/sys/freebsd/sys/_cpuset.d \
core/sys/freebsd/sys/cdefs.d core/sys/freebsd/sys/elf.d \
core/sys/freebsd/sys/elf32.d core/sys/freebsd/sys/elf64.d \
core/sys/freebsd/sys/elf_common.d core/sys/freebsd/sys/event.d \
core/sys/freebsd/sys/link_elf.d core/sys/freebsd/sys/mman.d \
core/sys/freebsd/sys/mount.d core/sys/freebsd/time.d \
core/sys/freebsd/unistd.d

DRUNTIME_DSOURCES_LINUX = core/sys/linux/config.d \
core/sys/linux/dlfcn.d core/sys/linux/elf.d core/sys/linux/epoll.d \
core/sys/linux/errno.d core/sys/linux/execinfo.d \
core/sys/linux/err.d core/sys/linux/errno.d core/sys/linux/execinfo.d \
core/sys/linux/fcntl.d core/sys/linux/ifaddrs.d core/sys/linux/link.d \
core/sys/linux/netinet/in_.d core/sys/linux/netinet/tcp.d \
core/sys/linux/sched.d core/sys/linux/stdio.d core/sys/linux/string.d \
Expand All @@ -264,54 +256,56 @@ DRUNTIME_DSOURCES_LINUX = core/sys/linux/config.d \
core/sys/linux/unistd.d

DRUNTIME_DSOURCES_NETBSD = core/sys/netbsd/dlfcn.d \
core/sys/netbsd/execinfo.d core/sys/netbsd/string.d \
core/sys/netbsd/sys/elf.d core/sys/netbsd/sys/elf32.d \
core/sys/netbsd/sys/elf64.d core/sys/netbsd/sys/elf_common.d \
core/sys/netbsd/sys/event.d core/sys/netbsd/sys/featuretest.d \
core/sys/netbsd/sys/link_elf.d core/sys/netbsd/sys/mman.d \
core/sys/netbsd/time.d
core/sys/netbsd/err.d core/sys/netbsd/execinfo.d \
core/sys/netbsd/string.d core/sys/netbsd/sys/elf.d \
core/sys/netbsd/sys/elf32.d core/sys/netbsd/sys/elf64.d \
core/sys/netbsd/sys/elf_common.d core/sys/netbsd/sys/event.d \
core/sys/netbsd/sys/featuretest.d core/sys/netbsd/sys/link_elf.d \
core/sys/netbsd/sys/mman.d core/sys/netbsd/time.d

DRUNTIME_DSOURCES_OPENBSD = core/sys/openbsd/dlfcn.d \
core/sys/openbsd/string.d core/sys/openbsd/sys/cdefs.d \
core/sys/openbsd/sys/elf.d core/sys/openbsd/sys/elf32.d \
core/sys/openbsd/sys/elf64.d core/sys/openbsd/sys/elf_common.d \
core/sys/openbsd/sys/link_elf.d core/sys/openbsd/sys/mman.d \
core/sys/openbsd/time.d
core/sys/openbsd/err.d core/sys/openbsd/string.d \
core/sys/openbsd/sys/cdefs.d core/sys/openbsd/sys/elf.d \
core/sys/openbsd/sys/elf32.d core/sys/openbsd/sys/elf64.d \
core/sys/openbsd/sys/elf_common.d core/sys/openbsd/sys/link_elf.d \
core/sys/openbsd/sys/mman.d core/sys/openbsd/time.d

DRUNTIME_DSOURCES_POSIX = core/sys/posix/aio.d \
core/sys/posix/arpa/inet.d core/sys/posix/config.d \
core/sys/posix/dirent.d core/sys/posix/dlfcn.d core/sys/posix/fcntl.d \
core/sys/posix/grp.d core/sys/posix/iconv.d core/sys/posix/inttypes.d \
core/sys/posix/libgen.d core/sys/posix/mqueue.d \
core/sys/posix/net/if_.d core/sys/posix/netdb.d \
core/sys/posix/netinet/in_.d core/sys/posix/netinet/tcp.d \
core/sys/posix/poll.d core/sys/posix/pthread.d core/sys/posix/pwd.d \
core/sys/posix/sched.d core/sys/posix/semaphore.d \
core/sys/posix/setjmp.d core/sys/posix/signal.d core/sys/posix/spawn.d \
core/sys/posix/stdio.d core/sys/posix/stdlib.d \
core/sys/posix/sys/filio.d core/sys/posix/sys/ioccom.d \
core/sys/posix/sys/ioctl.d core/sys/posix/sys/ipc.d \
core/sys/posix/sys/mman.d core/sys/posix/sys/msg.d \
core/sys/posix/sys/resource.d core/sys/posix/sys/select.d \
core/sys/posix/sys/shm.d core/sys/posix/sys/socket.d \
core/sys/posix/sys/stat.d core/sys/posix/sys/statvfs.d \
core/sys/posix/sys/time.d core/sys/posix/sys/ttycom.d \
core/sys/posix/sys/types.d core/sys/posix/sys/uio.d \
core/sys/posix/sys/un.d core/sys/posix/sys/utsname.d \
core/sys/posix/sys/wait.d core/sys/posix/syslog.d \
core/sys/posix/termios.d core/sys/posix/time.d \
core/sys/posix/libgen.d core/sys/posix/locale.d \
core/sys/posix/mqueue.d core/sys/posix/net/if_.d \
core/sys/posix/netdb.d core/sys/posix/netinet/in_.d \
core/sys/posix/netinet/tcp.d core/sys/posix/poll.d \
core/sys/posix/pthread.d core/sys/posix/pwd.d core/sys/posix/sched.d \
core/sys/posix/semaphore.d core/sys/posix/setjmp.d \
core/sys/posix/signal.d core/sys/posix/spawn.d \
core/sys/posix/stdc/time.d core/sys/posix/stdio.d \
core/sys/posix/stdlib.d core/sys/posix/string.d \
core/sys/posix/strings.d core/sys/posix/sys/filio.d \
core/sys/posix/sys/ioccom.d core/sys/posix/sys/ioctl.d \
core/sys/posix/sys/ipc.d core/sys/posix/sys/mman.d \
core/sys/posix/sys/msg.d core/sys/posix/sys/resource.d \
core/sys/posix/sys/select.d core/sys/posix/sys/shm.d \
core/sys/posix/sys/socket.d core/sys/posix/sys/stat.d \
core/sys/posix/sys/statvfs.d core/sys/posix/sys/time.d \
core/sys/posix/sys/ttycom.d core/sys/posix/sys/types.d \
core/sys/posix/sys/uio.d core/sys/posix/sys/un.d \
core/sys/posix/sys/utsname.d core/sys/posix/sys/wait.d \
core/sys/posix/syslog.d core/sys/posix/termios.d core/sys/posix/time.d \
core/sys/posix/ucontext.d core/sys/posix/unistd.d \
core/sys/posix/utime.d

DRUNTIME_DSOURCES_SOLARIS = core/sys/solaris/dlfcn.d \
core/sys/solaris/elf.d core/sys/solaris/execinfo.d \
core/sys/solaris/libelf.d core/sys/solaris/link.d \
core/sys/solaris/sys/elf.d core/sys/solaris/sys/elf_386.d \
core/sys/solaris/sys/elf_SPARC.d core/sys/solaris/sys/elf_amd64.d \
core/sys/solaris/sys/elf_notes.d core/sys/solaris/sys/elftypes.d \
core/sys/solaris/sys/link.d core/sys/solaris/sys/priocntl.d \
core/sys/solaris/sys/procset.d core/sys/solaris/sys/types.d \
core/sys/solaris/time.d
core/sys/solaris/elf.d core/sys/solaris/err.d \
core/sys/solaris/execinfo.d core/sys/solaris/libelf.d \
core/sys/solaris/link.d core/sys/solaris/sys/elf.d \
core/sys/solaris/sys/elf_386.d core/sys/solaris/sys/elf_SPARC.d \
core/sys/solaris/sys/elf_amd64.d core/sys/solaris/sys/elf_notes.d \
core/sys/solaris/sys/elftypes.d core/sys/solaris/sys/link.d \
core/sys/solaris/sys/priocntl.d core/sys/solaris/sys/procset.d \
core/sys/solaris/sys/types.d core/sys/solaris/time.d

DRUNTIME_DSOURCES_WINDOWS = core/sys/windows/accctrl.d \
core/sys/windows/aclapi.d core/sys/windows/aclui.d \
Expand Down Expand Up @@ -371,15 +365,16 @@ DRUNTIME_DSOURCES_WINDOWS = core/sys/windows/accctrl.d \
core/sys/windows/rpcdcep.d core/sys/windows/rpcndr.d \
core/sys/windows/rpcnsi.d core/sys/windows/rpcnsip.d \
core/sys/windows/rpcnterr.d core/sys/windows/schannel.d \
core/sys/windows/secext.d core/sys/windows/security.d \
core/sys/windows/servprov.d core/sys/windows/setupapi.d \
core/sys/windows/shellapi.d core/sys/windows/shldisp.d \
core/sys/windows/shlguid.d core/sys/windows/shlobj.d \
core/sys/windows/shlwapi.d core/sys/windows/snmp.d \
core/sys/windows/sql.d core/sys/windows/sqlext.d \
core/sys/windows/sqltypes.d core/sys/windows/sqlucode.d \
core/sys/windows/sspi.d core/sys/windows/stacktrace.d \
core/sys/windows/stat.d core/sys/windows/subauth.d \
core/sys/windows/sdkddkver.d core/sys/windows/secext.d \
core/sys/windows/security.d core/sys/windows/servprov.d \
core/sys/windows/setupapi.d core/sys/windows/shellapi.d \
core/sys/windows/shldisp.d core/sys/windows/shlguid.d \
core/sys/windows/shlobj.d core/sys/windows/shlwapi.d \
core/sys/windows/snmp.d core/sys/windows/sql.d \
core/sys/windows/sqlext.d core/sys/windows/sqltypes.d \
core/sys/windows/sqlucode.d core/sys/windows/sspi.d \
core/sys/windows/stacktrace.d core/sys/windows/stat.d \
core/sys/windows/stdc/time.d core/sys/windows/subauth.d \
core/sys/windows/threadaux.d core/sys/windows/tlhelp32.d \
core/sys/windows/tmschema.d core/sys/windows/unknwn.d \
core/sys/windows/uuid.d core/sys/windows/vfw.d \
Expand Down
Loading

0 comments on commit 92dd3e7

Please sign in to comment.