Skip to content

Commit 9468a0f

Browse files
nemanjaitstellar
nemanjai
authored and
tstellar
committed
[PowerPC] Define XL-compatible macros only for AIX and Linux
Since XLC only ever shipped on PowerPC AIX and Linux, it is not reasonable to provide the compatibility macros on any target other than those two. This patch restricts those macros to AIX/Linux. Differential revision: https://reviews.llvm.org/D110213 (cherry picked from commit c9539f9)
1 parent ae24102 commit 9468a0f

34 files changed

+104
-91
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,10 @@ static void defineXLCompatMacros(MacroBuilder &Builder) {
243243
void PPCTargetInfo::getTargetDefines(const LangOptions &Opts,
244244
MacroBuilder &Builder) const {
245245

246-
defineXLCompatMacros(Builder);
246+
// We define the XLC compatibility macros only on AIX and Linux since XLC
247+
// was never available on any other platforms.
248+
if (getTriple().isOSAIX() || getTriple().isOSLinux())
249+
defineXLCompatMacros(Builder);
247250

248251
// Target identification.
249252
Builder.defineMacro("__ppc__");

‎clang/test/CodeGen/builtins-ppc-xlcompat-LoadReseve-StoreCond-64bit-only.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// RUN: FileCheck %s --check-prefix=CHECK32-ERROR
44
// RUN: %clang_cc1 -O2 -triple=powerpc64-unknown-aix -emit-llvm %s -o - | \
55
// RUN: FileCheck %s --check-prefix=CHECK64
6-
// RUN: %clang_cc1 -O2 -triple=powerpc64le-unknown-unknown -emit-llvm %s \
6+
// RUN: %clang_cc1 -O2 -triple=powerpc64le-unknown-linux-gnu -emit-llvm %s \
77
// RUN: -o - | FileCheck %s --check-prefix=CHECK64
8-
// RUN: %clang_cc1 -O2 -triple=powerpc64-unknown-unknown -emit-llvm %s \
8+
// RUN: %clang_cc1 -O2 -triple=powerpc64-unknown-linux-gnu -emit-llvm %s \
99
// RUN: -o - | FileCheck %s --check-prefix=CHECK64
1010

1111
long test_ldarx(volatile long* a) {

‎clang/test/CodeGen/builtins-ppc-xlcompat-LoadReseve-StoreCond.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// RUN: -emit-llvm %s -o - | FileCheck %s
44
// RUN: %clang_cc1 -O2 -target-cpu pwr8 -triple=powerpc64-unknown-aix \
55
// RUN: -emit-llvm %s -o - | FileCheck %s
6-
// RUN: %clang_cc1 -O2 -target-cpu pwr8 -triple=powerpc64le-unknown-unknown \
6+
// RUN: %clang_cc1 -O2 -target-cpu pwr8 -triple=powerpc64le-unknown-linux-gnu \
77
// RUN: -emit-llvm %s -o - | FileCheck %s
8-
// RUN: %clang_cc1 -O2 -target-cpu pwr8 -triple=powerpc64-unknown-unknown \
8+
// RUN: %clang_cc1 -O2 -target-cpu pwr8 -triple=powerpc64-unknown-linux-gnu \
99
// RUN: -emit-llvm %s -o - | FileCheck %s
1010
// RAUN: not %clang_cc1 -O2 -target-cpu pwr7 -triple=powerpc-unknown-aix \
1111
// RAUN: -emit-llvm %s -o - 2>&1 | FileCheck %s \

‎clang/test/CodeGen/builtins-ppc-xlcompat-cas.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
22
// REQUIRES: powerpc-registered-target
3-
// RUN: %clang_cc1 -triple powerpc64-unknown-unknown \
3+
// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu \
44
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s
5-
// RUN: %clang_cc1 -triple powerpc64le-unknown-unknown \
5+
// RUN: %clang_cc1 -triple powerpc64le-unknown-linux-gnu \
66
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s
77

88

‎clang/test/CodeGen/builtins-ppc-xlcompat-cipher.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// REQUIRES: powerpc-registered-target
2-
// RUN: %clang_cc1 -triple powerpc64-unknown-unknown \
2+
// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu \
33
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s
4-
// RUN: %clang_cc1 -triple powerpc64le-unknown-unknown \
4+
// RUN: %clang_cc1 -triple powerpc64le-unknown-linux-gnu \
55
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s
66
// RUN: %clang_cc1 -triple powerpc64-unknown-aix \
77
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s
8-
// RUN: %clang_cc1 -triple powerpc-unknown-unknown \
8+
// RUN: %clang_cc1 -triple powerpc-unknown-linux-gnu \
99
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s
10-
// RUN: %clang_cc1 -triple powerpcle-unknown-unknown \
10+
// RUN: %clang_cc1 -triple powerpcle-unknown-linux-gnu \
1111
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s
1212
// RUN: %clang_cc1 -triple powerpc-unknown-aix \
1313
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s

‎clang/test/CodeGen/builtins-ppc-xlcompat-cmplx.c

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
// REQUIRES: powerpc-registered-target
21
// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
3-
// RUN: %clang_cc1 -triple powerpc64-unknown-unknown \
2+
// REQUIRES: powerpc-registered-target
3+
// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu \
44
// RUN: -emit-llvm %s -o - -target-cpu pwr7 | FileCheck %s --check-prefix=64BIT
5-
// RUN: %clang_cc1 -triple powerpc64le-unknown-unknown \
5+
// RUN: %clang_cc1 -triple powerpc64le-unknown-linux-gnu \
66
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s --check-prefix=64BITLE
77
// RUN: %clang_cc1 -triple powerpc64-unknown-aix \
88
// RUN: -emit-llvm %s -o - -target-cpu pwr7 | FileCheck %s --check-prefix=64BITAIX
9-
// RUN: %clang_cc1 -triple powerpc-unknown-unknown \
9+
// RUN: %clang_cc1 -triple powerpc-unknown-linux-gnu \
1010
// RUN: -emit-llvm %s -o - -target-cpu pwr7 | FileCheck %s --check-prefix=32BIT
11-
// RUN: %clang_cc1 -triple powerpcle-unknown-unknown \
11+
// RUN: %clang_cc1 -triple powerpcle-unknown-linux-gnu \
1212
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s --check-prefix=32BITLE
1313
// RUN: %clang_cc1 -triple powerpc-unknown-aix \
1414
// RUN: -emit-llvm %s -o - -target-cpu pwr7 | FileCheck %s --check-prefix=32BITAIX
@@ -175,37 +175,47 @@ double _Complex testcmplx(double real, double imag) {
175175
//
176176
// 32BIT-LABEL: @testcmplxf(
177177
// 32BIT-NEXT: entry:
178-
// 32BIT-NEXT: [[RETVAL:%.*]] = alloca { float, float }, align 4
179178
// 32BIT-NEXT: [[REAL_ADDR:%.*]] = alloca float, align 4
180179
// 32BIT-NEXT: [[IMAG_ADDR:%.*]] = alloca float, align 4
181180
// 32BIT-NEXT: store float [[REAL:%.*]], float* [[REAL_ADDR]], align 4
182181
// 32BIT-NEXT: store float [[IMAG:%.*]], float* [[IMAG_ADDR]], align 4
183182
// 32BIT-NEXT: [[TMP0:%.*]] = load float, float* [[REAL_ADDR]], align 4
184183
// 32BIT-NEXT: [[TMP1:%.*]] = load float, float* [[IMAG_ADDR]], align 4
185-
// 32BIT-NEXT: [[RETVAL_REALP:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[RETVAL]], i32 0, i32 0
186-
// 32BIT-NEXT: [[RETVAL_IMAGP:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[RETVAL]], i32 0, i32 1
187-
// 32BIT-NEXT: store float [[TMP0]], float* [[RETVAL_REALP]], align 4
188-
// 32BIT-NEXT: store float [[TMP1]], float* [[RETVAL_IMAGP]], align 4
189-
// 32BIT-NEXT: [[TMP2:%.*]] = bitcast { float, float }* [[RETVAL]] to i64*
190-
// 32BIT-NEXT: [[TMP3:%.*]] = load i64, i64* [[TMP2]], align 4
191-
// 32BIT-NEXT: ret i64 [[TMP3]]
184+
// 32BIT-NEXT: [[AGG_RESULT_REALP:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT:%.*]], i32 0, i32 0
185+
// 32BIT-NEXT: [[AGG_RESULT_IMAGP:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT]], i32 0, i32 1
186+
// 32BIT-NEXT: store float [[TMP0]], float* [[AGG_RESULT_REALP]], align 4
187+
// 32BIT-NEXT: store float [[TMP1]], float* [[AGG_RESULT_IMAGP]], align 4
188+
// 32BIT-NEXT: [[AGG_RESULT_REALP1:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT]], i32 0, i32 0
189+
// 32BIT-NEXT: [[AGG_RESULT_REAL:%.*]] = load float, float* [[AGG_RESULT_REALP1]], align 4
190+
// 32BIT-NEXT: [[AGG_RESULT_IMAGP2:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT]], i32 0, i32 1
191+
// 32BIT-NEXT: [[AGG_RESULT_IMAG:%.*]] = load float, float* [[AGG_RESULT_IMAGP2]], align 4
192+
// 32BIT-NEXT: [[AGG_RESULT_REALP3:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT]], i32 0, i32 0
193+
// 32BIT-NEXT: [[AGG_RESULT_IMAGP4:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT]], i32 0, i32 1
194+
// 32BIT-NEXT: store float [[AGG_RESULT_REAL]], float* [[AGG_RESULT_REALP3]], align 4
195+
// 32BIT-NEXT: store float [[AGG_RESULT_IMAG]], float* [[AGG_RESULT_IMAGP4]], align 4
196+
// 32BIT-NEXT: ret void
192197
//
193198
// 32BITLE-LABEL: @testcmplxf(
194199
// 32BITLE-NEXT: entry:
195-
// 32BITLE-NEXT: [[RETVAL:%.*]] = alloca { float, float }, align 4
196200
// 32BITLE-NEXT: [[REAL_ADDR:%.*]] = alloca float, align 4
197201
// 32BITLE-NEXT: [[IMAG_ADDR:%.*]] = alloca float, align 4
198202
// 32BITLE-NEXT: store float [[REAL:%.*]], float* [[REAL_ADDR]], align 4
199203
// 32BITLE-NEXT: store float [[IMAG:%.*]], float* [[IMAG_ADDR]], align 4
200204
// 32BITLE-NEXT: [[TMP0:%.*]] = load float, float* [[REAL_ADDR]], align 4
201205
// 32BITLE-NEXT: [[TMP1:%.*]] = load float, float* [[IMAG_ADDR]], align 4
202-
// 32BITLE-NEXT: [[RETVAL_REALP:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[RETVAL]], i32 0, i32 0
203-
// 32BITLE-NEXT: [[RETVAL_IMAGP:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[RETVAL]], i32 0, i32 1
204-
// 32BITLE-NEXT: store float [[TMP0]], float* [[RETVAL_REALP]], align 4
205-
// 32BITLE-NEXT: store float [[TMP1]], float* [[RETVAL_IMAGP]], align 4
206-
// 32BITLE-NEXT: [[TMP2:%.*]] = bitcast { float, float }* [[RETVAL]] to i64*
207-
// 32BITLE-NEXT: [[TMP3:%.*]] = load i64, i64* [[TMP2]], align 4
208-
// 32BITLE-NEXT: ret i64 [[TMP3]]
206+
// 32BITLE-NEXT: [[AGG_RESULT_REALP:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT:%.*]], i32 0, i32 0
207+
// 32BITLE-NEXT: [[AGG_RESULT_IMAGP:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT]], i32 0, i32 1
208+
// 32BITLE-NEXT: store float [[TMP0]], float* [[AGG_RESULT_REALP]], align 4
209+
// 32BITLE-NEXT: store float [[TMP1]], float* [[AGG_RESULT_IMAGP]], align 4
210+
// 32BITLE-NEXT: [[AGG_RESULT_REALP1:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT]], i32 0, i32 0
211+
// 32BITLE-NEXT: [[AGG_RESULT_REAL:%.*]] = load float, float* [[AGG_RESULT_REALP1]], align 4
212+
// 32BITLE-NEXT: [[AGG_RESULT_IMAGP2:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT]], i32 0, i32 1
213+
// 32BITLE-NEXT: [[AGG_RESULT_IMAG:%.*]] = load float, float* [[AGG_RESULT_IMAGP2]], align 4
214+
// 32BITLE-NEXT: [[AGG_RESULT_REALP3:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT]], i32 0, i32 0
215+
// 32BITLE-NEXT: [[AGG_RESULT_IMAGP4:%.*]] = getelementptr inbounds { float, float }, { float, float }* [[AGG_RESULT]], i32 0, i32 1
216+
// 32BITLE-NEXT: store float [[AGG_RESULT_REAL]], float* [[AGG_RESULT_REALP3]], align 4
217+
// 32BITLE-NEXT: store float [[AGG_RESULT_IMAG]], float* [[AGG_RESULT_IMAGP4]], align 4
218+
// 32BITLE-NEXT: ret void
209219
//
210220
// 32BITAIX-LABEL: @testcmplxf(
211221
// 32BITAIX-NEXT: entry:

‎clang/test/CodeGen/builtins-ppc-xlcompat-compare.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: powerpc-registered-target
2-
// RUN: %clang_cc1 -triple powerpc64-unknown-unknown \
2+
// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu \
33
// RUN: -emit-llvm %s -o - -target-cpu pwr7 | FileCheck %s --check-prefix=CHECK-64B
4-
// RUN: %clang_cc1 -triple powerpc64le-unknown-unknown \
4+
// RUN: %clang_cc1 -triple powerpc64le-unknown-linux-gnu \
55
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s --check-prefix=CHECK-64B
66
// RUN: %clang_cc1 -triple powerpc-unknown-aix \
77
// RUN: -emit-llvm %s -o - -target-cpu pwr7 | FileCheck %s --check-prefix=CHECK-32B

‎clang/test/CodeGen/builtins-ppc-xlcompat-conversionfunc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: powerpc-registered-target
2-
// RUN: %clang_cc1 -O2 -triple powerpc64-unknown-unknown \
2+
// RUN: %clang_cc1 -O2 -triple powerpc64-unknown-linux-gnu \
33
// RUN: -emit-llvm %s -o - -target-cpu pwr7 | FileCheck %s
4-
// RUN: %clang_cc1 -O2 -triple powerpc64le-unknown-unknown \
4+
// RUN: %clang_cc1 -O2 -triple powerpc64le-unknown-linux-gnu \
55
// RUN: -emit-llvm %s -o - -target-cpu pwr8 | FileCheck %s
66
// RUN: %clang_cc1 -O2 -triple powerpc-unknown-aix \
77
// RUN: -emit-llvm %s -o - -target-cpu pwr7 | FileCheck %s

‎clang/test/CodeGen/builtins-ppc-xlcompat-darn.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// REQUIRES: powerpc-registered-target
2-
// RUN: %clang_cc1 -triple powerpc64-unknown-unknown \
2+
// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu \
33
// RUN: -emit-llvm %s -o - -target-cpu pwr9 | FileCheck %s
4-
// RUN: %clang_cc1 -triple powerpc64le-unknown-unknown \
4+
// RUN: %clang_cc1 -triple powerpc64le-unknown-linux-gnu \
55
// RUN: -emit-llvm %s -o - -target-cpu pwr9 | FileCheck %s
66
// RUN: %clang_cc1 -triple powerpc64-unknown-aix \
77
// RUN: -emit-llvm %s -o - -target-cpu pwr9 | FileCheck %s
8-
// RUN: %clang_cc1 -triple powerpc-unknown-unknown \
8+
// RUN: %clang_cc1 -triple powerpc-unknown-linux-gnu \
99
// RUN: -emit-llvm %s -o - -target-cpu pwr9 | FileCheck %s
10-
// RUN: %clang_cc1 -triple powerpcle-unknown-unknown \
10+
// RUN: %clang_cc1 -triple powerpcle-unknown-linux-gnu \
1111
// RUN: -emit-llvm %s -o - -target-cpu pwr9 | FileCheck %s
1212
// RUN: %clang_cc1 -triple powerpc-unknown-aix \
1313
// RUN: -emit-llvm %s -o - -target-cpu pwr9 | FileCheck %s

‎clang/test/CodeGen/builtins-ppc-xlcompat-error.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: powerpc-registered-target
2-
// RUN: %clang_cc1 -triple powerpc64-unknown-unknown -fsyntax-only \
2+
// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu -fsyntax-only \
33
// RUN: -Wall -Werror -verify %s
4-
// RUN: %clang_cc1 -triple powerpc64le-unknown-unknown -fsyntax-only \
4+
// RUN: %clang_cc1 -triple powerpc64le-unknown-linux-gnu -fsyntax-only \
55
// RUN: -Wall -Werror -verify %s
66
// RUN: %clang_cc1 -triple powerpc64-unknown-aix -fsyntax-only \
77
// RUN: -Wall -Werror -verify %s

0 commit comments

Comments
 (0)