Skip to content

Commit 92ef772

Browse files
mylai-mtkmylai-mtk
committed
fixup: Drop adding func-sig macro for now
1 parent 02d43b3 commit 92ef772

File tree

2 files changed

+1
-66
lines changed

2 files changed

+1
-66
lines changed

‎clang/lib/Basic/Targets/RISCV.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
250250
Builder.defineMacro("__riscv_landing_pad_unlabeled");
251251
break;
252252
case CFBranchLabelSchemeKind::FuncSig:
253-
Builder.defineMacro("__riscv_landing_pad_func_sig");
253+
// TODO: Define macros after the func-sig scheme is implemented
254254
break;
255255
case CFBranchLabelSchemeKind::Default:
256256
llvm_unreachable("default cf-branch-label scheme should already be "

‎clang/test/Preprocessor/riscv-cf-protection-branch.c

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,13 @@
1-
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
2-
// RUN: -march=rv32i_zicfilp1p0 -fcf-protection=branch -E -dM %s -o - | \
3-
// RUN: FileCheck --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
4-
51
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
62
// RUN: -march=rv32i_zicfilp1p0 -fcf-protection=branch \
73
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
84
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s
95

10-
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
11-
// RUN: -march=rv32i_zicfilp1p0 -fcf-protection=branch \
12-
// RUN: -mcf-branch-label-scheme=func-sig -E -dM %s -o - | FileCheck \
13-
// RUN: --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
14-
15-
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
16-
// RUN: -march=rv32i_zicfilp1p0 -fcf-protection=full -E -dM %s -o - | \
17-
// RUN: FileCheck --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
18-
196
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
207
// RUN: -march=rv32i_zicfilp1p0 -fcf-protection=full \
218
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
229
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s
2310

24-
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
25-
// RUN: -march=rv32i_zicfilp1p0 -fcf-protection=full \
26-
// RUN: -mcf-branch-label-scheme=func-sig -E -dM %s -o - | FileCheck \
27-
// RUN: --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
28-
2911
// RUN: %clang --target=riscv32 -menable-experimental-extensions \
3012
// RUN: -march=rv32i_zicfilp1p0 -E -dM %s -o - 2>&1 | \
3113
// RUN: FileCheck --check-prefixes=NO-MACRO %s
@@ -38,28 +20,14 @@
3820
// RUN: -march=rv32i_zicfilp1p0 -mcf-branch-label-scheme=func-sig -E -dM %s \
3921
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s
4022

41-
// RUN: %clang --target=riscv32 -fcf-protection=branch -E -dM -emit-llvm %s \
42-
// RUN: -o - | FileCheck --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
43-
4423
// RUN: %clang --target=riscv32 -fcf-protection=branch \
4524
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM -emit-llvm %s -o - | \
4625
// RUN: FileCheck --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s
4726

48-
// RUN: %clang --target=riscv32 -fcf-protection=branch \
49-
// RUN: -mcf-branch-label-scheme=func-sig -E -dM %s -o - | FileCheck \
50-
// RUN: --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
51-
52-
// RUN: %clang --target=riscv32 -fcf-protection=full -E -dM -emit-llvm %s \
53-
// RUN: -o - | FileCheck --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
54-
5527
// RUN: %clang --target=riscv32 -fcf-protection=full \
5628
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM -emit-llvm %s -o - | \
5729
// RUN: FileCheck --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s
5830

59-
// RUN: %clang --target=riscv32 -fcf-protection=full \
60-
// RUN: -mcf-branch-label-scheme=func-sig -E -dM %s -o - | FileCheck \
61-
// RUN: --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
62-
6331
// RUN: %clang --target=riscv32 -E -dM %s -o - 2>&1 | \
6432
// RUN: FileCheck --check-prefixes=NO-MACRO %s
6533

@@ -69,34 +37,16 @@
6937
// RUN: %clang --target=riscv32 -mcf-branch-label-scheme=func-sig -E -dM %s \
7038
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s
7139

72-
// RUN: %clang --target=riscv64 -menable-experimental-extensions \
73-
// RUN: -march=rv64i_zicfilp1p0 -fcf-protection=branch -E -dM %s -o - | \
74-
// RUN: FileCheck --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
75-
7640
// RUN: %clang --target=riscv64 -menable-experimental-extensions \
7741
// RUN: -march=rv64i_zicfilp1p0 -fcf-protection=branch \
7842
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
7943
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s
8044

81-
// RUN: %clang --target=riscv64 -menable-experimental-extensions \
82-
// RUN: -march=rv64i_zicfilp1p0 -fcf-protection=branch \
83-
// RUN: -mcf-branch-label-scheme=func-sig -E -dM %s -o - | FileCheck \
84-
// RUN: --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
85-
86-
// RUN: %clang --target=riscv64 -menable-experimental-extensions \
87-
// RUN: -march=rv64i_zicfilp1p0 -fcf-protection=full -E -dM %s -o - | \
88-
// RUN: FileCheck --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
89-
9045
// RUN: %clang --target=riscv64 -menable-experimental-extensions \
9146
// RUN: -march=rv64i_zicfilp1p0 -fcf-protection=full \
9247
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
9348
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s
9449

95-
// RUN: %clang --target=riscv64 -menable-experimental-extensions \
96-
// RUN: -march=rv64i_zicfilp1p0 -fcf-protection=full \
97-
// RUN: -mcf-branch-label-scheme=func-sig -E -dM %s -o - | FileCheck \
98-
// RUN: --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
99-
10050
// RUN: %clang --target=riscv64 -menable-experimental-extensions \
10151
// RUN: -march=rv64i_zicfilp1p0 -E -dM %s -o - 2>&1 | \
10252
// RUN: FileCheck --check-prefixes=NO-MACRO %s
@@ -109,28 +59,14 @@
10959
// RUN: -march=rv64i_zicfilp1p0 -mcf-branch-label-scheme=func-sig -E -dM %s \
11060
// RUN: -o - 2>&1 | FileCheck --check-prefixes=NO-MACRO %s
11161

112-
// RUN: %clang --target=riscv64 -fcf-protection=branch -E -dM %s -o - | \
113-
// RUN: FileCheck --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
114-
11562
// RUN: %clang --target=riscv64 -fcf-protection=branch \
11663
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
11764
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s
11865

119-
// RUN: %clang --target=riscv64 -fcf-protection=branch \
120-
// RUN: -mcf-branch-label-scheme=func-sig -E -dM %s -o - | FileCheck \
121-
// RUN: --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
122-
123-
// RUN: %clang --target=riscv64 -fcf-protection=full -E -dM %s -o - | \
124-
// RUN: FileCheck --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
125-
12666
// RUN: %clang --target=riscv64 -fcf-protection=full \
12767
// RUN: -mcf-branch-label-scheme=unlabeled -E -dM %s -o - | FileCheck \
12868
// RUN: --check-prefixes=LPAD-MACRO,UNLABELED-MACRO %s
12969

130-
// RUN: %clang --target=riscv64 -fcf-protection=full \
131-
// RUN: -mcf-branch-label-scheme=func-sig -E -dM %s -o - | FileCheck \
132-
// RUN: --check-prefixes=LPAD-MACRO,FUNC-SIG-MACRO %s
133-
13470
// RUN: %clang --target=riscv64 -E -dM %s -o - 2>&1 | \
13571
// RUN: FileCheck --check-prefixes=NO-MACRO %s
13672

@@ -142,7 +78,6 @@
14278

14379
// LPAD-MACRO: __riscv_landing_pad 1{{$}}
14480
// UNLABELED-MACRO: __riscv_landing_pad_unlabeled 1{{$}}
145-
// FUNC-SIG-MACRO: __riscv_landing_pad_func_sig 1{{$}}
14681
// NO-MACRO-NOT: __riscv_landing_pad
14782
// NO-MACRO-NOT: __riscv_landing_pad_unlabeled
14883
// NO-MACRO-NOT: __riscv_landing_pad_func_sig

0 commit comments

Comments
 (0)