Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Bump LDC-LLVM to v11.0.1 #3639

Merged
merged 3 commits into from
Jan 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ jobs:
environment:
- PARALLELISM: 4
- CI_OS: osx
- LLVM_VERSION: 11.0.0
- LLVM_VERSION: 11.0.1
- HOST_LDC_VERSION: 1.24.0
- EXTRA_CMAKE_FLAGS: "-DBUILD_LTO_LIBS=ON"
macOS-x64-sharedLibsOnly:
Expand All @@ -143,7 +143,7 @@ jobs:
environment:
- PARALLELISM: 4
- CI_OS: osx
- LLVM_VERSION: 11.0.0
- LLVM_VERSION: 11.0.1
- HOST_LDC_VERSION: 1.24.0
- EXTRA_CMAKE_FLAGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_LTO_LIBS=ON"

Expand Down
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ task:
timeout_in: 60m
environment:
CI_OS: osx
LLVM_VERSION: 11.0.0
LLVM_VERSION: 11.0.1
# OS is preset to `darwin`
OS: osx
PATH: ${CIRRUS_WORKING_DIR}/../cmake/bin:${CIRRUS_WORKING_DIR}/../ninja:${CIRRUS_WORKING_DIR}/../llvm/bin:${PATH}
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ matrix:
- os: linux
arch: arm64
d: ldc-beta
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"
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"
addons:
apt:
sources:
Expand Down Expand Up @@ -42,7 +42,7 @@ matrix:

cache:
directories:
- llvm-11.0.0
- llvm-11.0.1
- llvm-10.0.0
- llvm-9.0.0
- llvm-8.0.0
Expand Down
6 changes: 5 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax: https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema

variables:
LLVM_VERSION: 11.0.0
LLVM_VERSION: 11.0.1
CLANG_VERSION: 11.0.0
HOST_LDC_VERSION: 1.24.0

Expand Down Expand Up @@ -58,6 +58,8 @@ jobs:
# support older user binutils (e.g., Ubuntu 14.04).
BOOTSTRAP_CMAKE_FLAGS: -DBUILD_LTO_LIBS=ON -DLDC_INSTALL_LTOPLUGIN=ON
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
# Official clang 11.0.0 was available for Ubuntu 16.04, but isn't anymore...
CLANG_VERSION: 10.0.1
steps:
- template: .azure-pipelines/posix.yml

Expand All @@ -82,6 +84,8 @@ jobs:
variables:
CI_OS: android
ANDROID_NDK_VERSION: r21d
# Official clang 11.0.0 was available for Ubuntu 16.04, but isn't anymore...
CLANG_VERSION: 10.0.1
strategy:
matrix:
armv7a:
Expand Down
2 changes: 1 addition & 1 deletion bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ app:
- BITRISE_PROJECT_PATH: ldc-build-runtime.tmp/TestRunner/TestRunner.xcodeproj
- BITRISE_SCHEME: TestRunner
- BITRISE_EXPORT_METHOD: development
- LLVM_VERSION: 11.0.0
- LLVM_VERSION: 11.0.1
- HOST_LDC_VERSION: 1.24.0
- IOS_VERSION: 12.0

Expand Down
15 changes: 6 additions & 9 deletions gen/asm-x86.h
Original file line number Diff line number Diff line change
Expand Up @@ -519,12 +519,9 @@ typedef enum {
Opr_NoType = 0x80,
} OprVals;

typedef struct {
} AsmOprInfo;

typedef unsigned char Opr;

typedef struct {
struct AsmOpInfo {
Opr operands[3];
#ifndef ASM_X86_64
unsigned char needsType : 3, implicitClobbers : 8, linkType : 2;
Expand All @@ -545,7 +542,7 @@ typedef struct {
}
return 3;
}
} AsmOpInfo;
};

typedef enum {
Mn_fdisi,
Expand Down Expand Up @@ -858,10 +855,10 @@ static AsmOpInfo asmOpInfo[N_AsmOpInfo] = {
#undef U
#undef N

typedef struct {
struct AsmOpEnt {
const char *inMnemonic;
AsmOp asmOp;
} AsmOpEnt;
};

/* Some opcodes have data size restrictions, which we don't check

Expand Down Expand Up @@ -2017,7 +2014,7 @@ static Expression *Handled;
static Identifier *ident_seg;

struct AsmProcessor {
typedef struct {
struct Operand {
int inBracket;
int hasBracket;
int hasNumber;
Expand All @@ -2035,7 +2032,7 @@ struct AsmProcessor {
OperandClass cls;
PtrType dataSize;
PtrType dataSizeHint; // DMD can use the type of a referenced variable
} Operand;
};

static const unsigned Max_Operands = 3;

Expand Down
2 changes: 1 addition & 1 deletion shippable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
global:
- secure: RQ6gpJFPBDGVlnz+ZzSgeMpkcnvcA/7Lzyj/r06fMFR5iOz2cYaImCekNRw2PlhYQ+0FCQ119TLMKNOa7OUu6XxUp5LZtq7pSB6QLe3RB3YysFsosNPlY/wyyRsrW9ICEbDP/X8kPcfrDtOPGS/dGIwgeo0+R4Yl0OLDK9GrExEY45bWgvuLqoWDO89pi31kBk5LG5MAYhHZ0UTdboi5A2GRT0T8M0kr53jBRka8FGkbncXfHp9+/6IjTVJoUduRkdsk0A9RN1KRoao6rtrBNNvwIStc6zxJSOHszoaTp/K/ucGC4InZl/9GHPS/Y78SGKn7YJv3tGmcGzqAxrVaXQ==
matrix:
- LLVM_VERSION=11.0.0
- LLVM_VERSION=11.0.1
HOST_LDC_VERSION=1.24.0
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"

Expand Down