Skip to content

Commit b7087e0

Browse files
committed
Merge remote-tracking branch 'origin/master' into merge-2.095
2 parents 78db387 + d4a5722 commit b7087e0

File tree

8 files changed

+19
-18
lines changed

8 files changed

+19
-18
lines changed

.azure-pipelines/windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
echo on
1919
cd ..
2020
:: Download & extract libcurl
21-
curl -L -o libcurl.7z https://github.com/ldc-developers/mingw-w64-libs/releases/download/v7.0.0/libcurl-7.69.1-zlib-static-ipv6-sspi-winssl.7z 2>&1
21+
curl -L -o libcurl.7z https://github.com/ldc-developers/mingw-w64-libs/releases/download/v8.0.0/libcurl-7.74.0-zlib-static-ipv6-sspi-schannel.7z 2>&1
2222
mkdir libcurl
2323
cd libcurl
2424
7z x ../libcurl.7z > nul

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
environment:
134134
- PARALLELISM: 4
135135
- CI_OS: osx
136-
- LLVM_VERSION: 11.0.0
136+
- LLVM_VERSION: 11.0.1
137137
- HOST_LDC_VERSION: 1.24.0
138138
- EXTRA_CMAKE_FLAGS: "-DBUILD_LTO_LIBS=ON"
139139
macOS-x64-sharedLibsOnly:
@@ -143,7 +143,7 @@ jobs:
143143
environment:
144144
- PARALLELISM: 4
145145
- CI_OS: osx
146-
- LLVM_VERSION: 11.0.0
146+
- LLVM_VERSION: 11.0.1
147147
- HOST_LDC_VERSION: 1.24.0
148148
- EXTRA_CMAKE_FLAGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_LTO_LIBS=ON"
149149

.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ task:
147147
timeout_in: 60m
148148
environment:
149149
CI_OS: osx
150-
LLVM_VERSION: 11.0.0
150+
LLVM_VERSION: 11.0.1
151151
# OS is preset to `darwin`
152152
OS: osx
153153
PATH: ${CIRRUS_WORKING_DIR}/../cmake/bin:${CIRRUS_WORKING_DIR}/../ninja:${CIRRUS_WORKING_DIR}/../llvm/bin:${PATH}

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ matrix:
99
- os: linux
1010
arch: arm64
1111
d: ldc-beta
12-
env: LLVM_VERSION=11.0.0 PARALLELISM=16 CC=gcc-8 CXX=g++-8 OPTS="-DLDC_INSTALL_LLVM_RUNTIME_LIBS_ARCH=aarch64 -DADDITIONAL_DEFAULT_LDC_SWITCHES='\"-linker=bfd\",' -DCOMPILE_ALL_D_FILES_AT_ONCE=OFF"
12+
env: LLVM_VERSION=11.0.1 PARALLELISM=16 CC=gcc-8 CXX=g++-8 OPTS="-DLDC_INSTALL_LLVM_RUNTIME_LIBS_ARCH=aarch64 -DADDITIONAL_DEFAULT_LDC_SWITCHES='\"-linker=bfd\",' -DCOMPILE_ALL_D_FILES_AT_ONCE=OFF"
1313
addons:
1414
apt:
1515
sources:
@@ -42,7 +42,7 @@ matrix:
4242

4343
cache:
4444
directories:
45-
- llvm-11.0.0
45+
- llvm-11.0.1
4646
- llvm-10.0.0
4747
- llvm-9.0.0
4848
- llvm-8.0.0

azure-pipelines.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax: https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema
22

33
variables:
4-
LLVM_VERSION: 11.0.0
4+
LLVM_VERSION: 11.0.1
55
CLANG_VERSION: 11.0.0
66
HOST_LDC_VERSION: 1.24.0
77

@@ -58,6 +58,8 @@ jobs:
5858
# support older user binutils (e.g., Ubuntu 14.04).
5959
BOOTSTRAP_CMAKE_FLAGS: -DBUILD_LTO_LIBS=ON -DLDC_INSTALL_LTOPLUGIN=ON
6060
EXTRA_CMAKE_FLAGS: -DMULTILIB=ON -DBUILD_LTO_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++ -DJITRT_EXTRA_LDFLAGS=-static-libstdc++ -DRT_CFLAGS=-Wa,-mrelax-relocations=no -DLDC_INSTALL_LTOPLUGIN=ON -DLDC_INSTALL_LLVM_RUNTIME_LIBS=ON -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto" -DEXTRA_CXXFLAGS=-flto=full
61+
# Official clang 11.0.0 was available for Ubuntu 16.04, but isn't anymore...
62+
CLANG_VERSION: 10.0.1
6163
steps:
6264
- template: .azure-pipelines/posix.yml
6365

@@ -82,6 +84,8 @@ jobs:
8284
variables:
8385
CI_OS: android
8486
ANDROID_NDK_VERSION: r21d
87+
# Official clang 11.0.0 was available for Ubuntu 16.04, but isn't anymore...
88+
CLANG_VERSION: 10.0.1
8589
strategy:
8690
matrix:
8791
armv7a:

bitrise.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ app:
77
- BITRISE_PROJECT_PATH: ldc-build-runtime.tmp/TestRunner/TestRunner.xcodeproj
88
- BITRISE_SCHEME: TestRunner
99
- BITRISE_EXPORT_METHOD: development
10-
- LLVM_VERSION: 11.0.0
10+
- LLVM_VERSION: 11.0.1
1111
- HOST_LDC_VERSION: 1.24.0
1212
- IOS_VERSION: 12.0
1313

gen/asm-x86.h

+6-9
Original file line numberDiff line numberDiff line change
@@ -519,12 +519,9 @@ typedef enum {
519519
Opr_NoType = 0x80,
520520
} OprVals;
521521

522-
typedef struct {
523-
} AsmOprInfo;
524-
525522
typedef unsigned char Opr;
526523

527-
typedef struct {
524+
struct AsmOpInfo {
528525
Opr operands[3];
529526
#ifndef ASM_X86_64
530527
unsigned char needsType : 3, implicitClobbers : 8, linkType : 2;
@@ -545,7 +542,7 @@ typedef struct {
545542
}
546543
return 3;
547544
}
548-
} AsmOpInfo;
545+
};
549546

550547
typedef enum {
551548
Mn_fdisi,
@@ -858,10 +855,10 @@ static AsmOpInfo asmOpInfo[N_AsmOpInfo] = {
858855
#undef U
859856
#undef N
860857

861-
typedef struct {
858+
struct AsmOpEnt {
862859
const char *inMnemonic;
863860
AsmOp asmOp;
864-
} AsmOpEnt;
861+
};
865862

866863
/* Some opcodes have data size restrictions, which we don't check
867864
@@ -2017,7 +2014,7 @@ static Expression *Handled;
20172014
static Identifier *ident_seg;
20182015

20192016
struct AsmProcessor {
2020-
typedef struct {
2017+
struct Operand {
20212018
int inBracket;
20222019
int hasBracket;
20232020
int hasNumber;
@@ -2035,7 +2032,7 @@ struct AsmProcessor {
20352032
OperandClass cls;
20362033
PtrType dataSize;
20372034
PtrType dataSizeHint; // DMD can use the type of a referenced variable
2038-
} Operand;
2035+
};
20392036

20402037
static const unsigned Max_Operands = 3;
20412038

shippable.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
global:
1414
- secure: RQ6gpJFPBDGVlnz+ZzSgeMpkcnvcA/7Lzyj/r06fMFR5iOz2cYaImCekNRw2PlhYQ+0FCQ119TLMKNOa7OUu6XxUp5LZtq7pSB6QLe3RB3YysFsosNPlY/wyyRsrW9ICEbDP/X8kPcfrDtOPGS/dGIwgeo0+R4Yl0OLDK9GrExEY45bWgvuLqoWDO89pi31kBk5LG5MAYhHZ0UTdboi5A2GRT0T8M0kr53jBRka8FGkbncXfHp9+/6IjTVJoUduRkdsk0A9RN1KRoao6rtrBNNvwIStc6zxJSOHszoaTp/K/ucGC4InZl/9GHPS/Y78SGKn7YJv3tGmcGzqAxrVaXQ==
1515
matrix:
16-
- LLVM_VERSION=11.0.0
16+
- LLVM_VERSION=11.0.1
1717
HOST_LDC_VERSION=1.24.0
1818
EXTRA_CMAKE_FLAGS="-DBUILD_LTO_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++ -DJITRT_EXTRA_LDFLAGS=-static-libstdc++ -DLDC_INSTALL_LTOPLUGIN=ON -DLDC_INSTALL_LLVM_RUNTIME_LIBS=ON -DLDC_INSTALL_LLVM_RUNTIME_LIBS_ARCH=aarch64"
1919

0 commit comments

Comments
 (0)