Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit 92f7382

Browse files
MartinNowakMartinNowak
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents 027fca5 + 4ca9c36 commit 92f7382

File tree

218 files changed

+1382
-709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+1382
-709
lines changed

‎.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ environment:
1717
CIRRUS_CLONE_DEPTH: 1
1818
# for ci.sh:
1919
MODEL: 64
20-
HOST_DC: dmd
20+
HOST_DMD: dmd
2121
N: 4
2222
OS_NAME: linux
2323
FULL_BUILD: false

‎.github/workflows/cxx.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ jobs:
269269
if: runner.os == 'Windows'
270270
shell: cmd
271271
env:
272-
HOST_DC: ${{ env.DC }}
272+
HOST_DMD: ${{ env.DC }}
273273
run: |
274274
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
275275
dmd -run ./dmd/src/build.d -j2 MODEL=64
@@ -300,7 +300,7 @@ jobs:
300300
if: runner.os == 'Windows'
301301
shell: cmd
302302
env:
303-
HOST_DC: ${{ env.DC }}
303+
HOST_DMD: ${{ env.DC }}
304304
run: |
305305
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
306306
cd druntime

‎changelog/accidentally-exposed-sigs.dd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Variables `suspendSignalNumber` and `resumeSignalNumber` are now private
2+
3+
These variables, which are in `core.thread.osthread`, were accidentally exposed.
4+
They shouldn't be accessed directly and have been made private.
5+
In order to set GC signals, one should call `thread_setGCSignals` instead.

‎mak/COPY

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ COPY=\
3333
$(IMPDIR)\core\internal\moving.d \
3434
$(IMPDIR)\core\internal\parseoptions.d \
3535
$(IMPDIR)\core\internal\postblit.d \
36+
$(IMPDIR)\core\internal\qsort.d \
3637
$(IMPDIR)\core\internal\spinlock.d \
3738
$(IMPDIR)\core\internal\string.d \
3839
$(IMPDIR)\core\internal\switch_.d \
@@ -50,9 +51,18 @@ COPY=\
5051
$(IMPDIR)\core\internal\array\operations.d \
5152
$(IMPDIR)\core\internal\array\utils.d \
5253
\
54+
$(IMPDIR)\core\internal\backtrace\dwarf.d \
55+
$(IMPDIR)\core\internal\backtrace\elf.d \
56+
$(IMPDIR)\core\internal\backtrace\macho.d \
57+
\
5358
$(IMPDIR)\core\internal\elf\dl.d \
5459
$(IMPDIR)\core\internal\elf\io.d \
5560
\
61+
$(IMPDIR)\core\internal\container\array.d \
62+
$(IMPDIR)\core\internal\container\common.d \
63+
$(IMPDIR)\core\internal\container\hashtab.d \
64+
$(IMPDIR)\core\internal\container\treap.d \
65+
\
5666
$(IMPDIR)\core\internal\util\array.d \
5767
\
5868
$(IMPDIR)\core\internal\vararg\aarch64.d \

‎mak/DOCS

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,18 @@ DOCS=\
8181
$(DOCDIR)\core_thread_fiber.html \
8282
$(DOCDIR)\core_thread_osthread.html \
8383
\
84+
$(DOCDIR)\core_internal_dassert.html \
8485
$(DOCDIR)\core_internal_execinfo.html \
86+
$(DOCDIR)\core_internal_qsort.html \
87+
\
88+
$(DOCDIR)\core_internal_backtrace_dwarf.html \
89+
$(DOCDIR)\core_internal_backtrace_elf.html \
90+
$(DOCDIR)\core_internal_backtrace_macho.html \
91+
\
92+
$(DOCDIR)\core_internal_container_array.html \
93+
$(DOCDIR)\core_internal_container_common.html \
94+
$(DOCDIR)\core_internal_container_hashtab.html \
95+
$(DOCDIR)\core_internal_container_treap.html \
8596
\
8697
$(DOCDIR)\rt_aaA.html \
8798
$(DOCDIR)\rt_aApply.html \
@@ -92,10 +103,6 @@ DOCS=\
92103
$(DOCDIR)\rt_arrayassign.html \
93104
$(DOCDIR)\rt_arraycat.html \
94105
\
95-
$(DOCDIR)\rt_backtrace_dwarf.html \
96-
$(DOCDIR)\rt_backtrace_elf.html \
97-
$(DOCDIR)\rt_backtrace_macho.html \
98-
\
99106
$(DOCDIR)\rt_cast_.html \
100107
$(DOCDIR)\rt_cmath2.html \
101108
$(DOCDIR)\rt_config.html \
@@ -115,7 +122,6 @@ DOCS=\
115122
$(DOCDIR)\rt_minfo.html \
116123
$(DOCDIR)\rt_monitor_.html \
117124
$(DOCDIR)\rt_profilegc.html \
118-
$(DOCDIR)\rt_qsort.html \
119125
$(DOCDIR)\rt_sections_android.html \
120126
$(DOCDIR)\rt_sections.html \
121127
$(DOCDIR)\rt_sections_darwin_64.html \
@@ -131,10 +137,5 @@ DOCS=\
131137
\
132138
$(DOCDIR)\rt_unwind.html \
133139
\
134-
$(DOCDIR)\rt_util_container_array.html \
135-
$(DOCDIR)\rt_util_container_common.html \
136-
$(DOCDIR)\rt_util_container_hashtab.html \
137-
$(DOCDIR)\rt_util_container_treap.html \
138140
$(DOCDIR)\rt_util_utility.html \
139-
$(DOCDIR)\rt_util_random.html \
140141
$(DOCDIR)\rt_util_typeinfo.html \

‎mak/SRCS

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ SRCS=\
3333
src\core\internal\moving.d \
3434
src\core\internal\parseoptions.d \
3535
src\core\internal\postblit.d \
36+
src\core\internal\qsort.d \
3637
src\core\internal\spinlock.d \
3738
src\core\internal\string.d \
3839
src\core\internal\switch_.d \
@@ -50,6 +51,15 @@ SRCS=\
5051
src\core\internal\array\operations.d \
5152
src\core\internal\array\utils.d \
5253
\
54+
src\core\internal\backtrace\dwarf.d \
55+
src\core\internal\backtrace\elf.d \
56+
src\core\internal\backtrace\macho.d \
57+
\
58+
src\core\internal\container\array.d \
59+
src\core\internal\container\common.d \
60+
src\core\internal\container\hashtab.d \
61+
src\core\internal\container\treap.d \
62+
\
5363
src\core\internal\elf\dl.d \
5464
src\core\internal\elf\io.d \
5565
\
@@ -520,7 +530,6 @@ SRCS=\
520530
src\rt\msvc.d \
521531
src\rt\msvc_math.d \
522532
src\rt\profilegc.d \
523-
src\rt\qsort.d \
524533
src\rt\sections.d \
525534
src\rt\sections_android.d \
526535
src\rt\sections_darwin_64.d \
@@ -535,16 +544,7 @@ SRCS=\
535544
src\rt\tracegc.d \
536545
src\rt\unwind.d \
537546
\
538-
src\rt\backtrace\dwarf.d \
539-
src\rt\backtrace\elf.d \
540-
src\rt\backtrace\macho.d \
541-
\
542-
src\rt\util\random.d \
543547
src\rt\util\typeinfo.d \
544548
src\rt\util\utility.d \
545-
src\rt\util\container\array.d \
546-
src\rt\util\container\common.d \
547-
src\rt\util\container\hashtab.d \
548-
src\rt\util\container\treap.d \
549549
\
550550
src\etc\linux\memoryerror.d

‎posix.mak

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,12 @@ $(DOCDIR)/core_gc_%.html : src/core/gc/%.d $(DMD)
159159
$(DOCDIR)/core_internal_%.html : src/core/internal/%.d $(DMD)
160160
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
161161

162+
$(DOCDIR)/core_internal_backtrace_%.html : src/core/internal/backtrace/%.d $(DMD)
163+
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
164+
165+
$(DOCDIR)/core_internal_container_%.html : src/core/internal/container/%.d $(DMD)
166+
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
167+
162168
$(DOCDIR)/core_internal_elf_%.html : src/core/internal/elf/%.d $(DMD)
163169
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
164170

@@ -189,15 +195,9 @@ $(DOCDIR)/core_thread_%.html : src/core/thread/%.d $(DMD)
189195
$(DOCDIR)/rt_%.html : src/rt/%.d $(DMD)
190196
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
191197

192-
$(DOCDIR)/rt_backtrace_%.html : src/rt/backtrace/%.d $(DMD)
193-
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
194-
195198
$(DOCDIR)/rt_typeinfo_%.html : src/rt/typeinfo/%.d $(DMD)
196199
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
197200

198-
$(DOCDIR)/rt_util_container_%.html : src/rt/util/container/%.d $(DMD)
199-
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
200-
201201
$(DOCDIR)/rt_util_%.html : src/rt/util/%.d $(DMD)
202202
$(DMD) $(DDOCFLAGS) -Df$@ project.ddoc $(DOCFMT) $<
203203

‎src/core/cpuid.d

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,10 @@ void cpuidX86()
774774
if (cf.miscfeatures & OSXSAVE_BIT)
775775
{
776776
version (GNU_OR_LDC) asm pure nothrow @nogc {
777-
"xgetbv" : "=a" (a), "=d" (d) : "c" (0);
777+
/* Old assemblers do not recognize xgetbv, and there is no easy way
778+
* to conditionally compile based on the assembler used, so use the
779+
* raw .byte sequence instead. */
780+
".byte 0x0f, 0x01, 0xd0" : "=a" (a), "=d" (d) : "c" (0);
778781
} else asm pure nothrow @nogc {
779782
mov ECX, 0;
780783
xgetbv;

0 commit comments

Comments
 (0)