This is an archive of the discontinued LLVM Phabricator instance.

Differential D158698

[Clang][M68k] Use `DefineStd` for target-specific macros
ClosedPublic

Authored by myhsu on Aug 23 2023, 9:19 PM.

Details

Reviewers
jrtc27
0x59616e
Commits
rG230558e444c2: [Clang][M68k] Use `DefineStd` for target-specific macros
Summary

(From the comments of D149867)
Use DefineStd for target-specific macros such that GNU-style definitions can be correctly toggled.

Diff Detail

Event Timeline

myhsu created this revision.Aug 23 2023, 9:19 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 23 2023, 9:19 PM
myhsu requested review of this revision.Aug 23 2023, 9:19 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 23 2023, 9:19 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B254528: Diff 552978.Aug 23 2023, 10:21 PM
0x59616e accepted this revision.Sep 1 2023, 7:53 PM
This revision is now accepted and ready to land.Sep 1 2023, 7:53 PM
This revision was landed with ongoing or failed builds.Sep 1 2023, 11:26 PM
Closed by commit rG230558e444c2: [Clang][M68k] Use `DefineStd` for target-specific macros (authored by myhsu). · Explain Why
This revision was automatically updated to reflect the committed changes.
myhsu added a commit: rG230558e444c2: [Clang][M68k] Use `DefineStd` for target-specific macros.

Revision Contents

PathSize
clang/
lib/
Basic/
Targets/
24 lines
test/
Driver/
40 lines

Diff 552978

clang/lib/Basic/Targets/M68k.cpp

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
} }
void M68kTargetInfo::getTargetDefines(const LangOptions &Opts, void M68kTargetInfo::getTargetDefines(const LangOptions &Opts,
MacroBuilder &Builder) const { MacroBuilder &Builder) const {
using llvm::Twine; using llvm::Twine;
Builder.defineMacro("__m68k__"); Builder.defineMacro("__m68k__");
Builder.defineMacro("mc68000"); DefineStd(Builder, "mc68000", Opts);
Builder.defineMacro("__mc68000");
Builder.defineMacro("__mc68000__");
// For sub-architecture // For sub-architecture
switch (CPU) { switch (CPU) {
case CK_68010: case CK_68010:
Builder.defineMacro("mc68010"); DefineStd(Builder, "mc68010", Opts);
Builder.defineMacro("__mc68010");
Builder.defineMacro("__mc68010__");
break; break;
case CK_68020: case CK_68020:
Builder.defineMacro("mc68020"); DefineStd(Builder, "mc68020", Opts);
Builder.defineMacro("__mc68020");
Builder.defineMacro("__mc68020__");
break; break;
case CK_68030: case CK_68030:
Builder.defineMacro("mc68030"); DefineStd(Builder, "mc68030", Opts);
Builder.defineMacro("__mc68030");
Builder.defineMacro("__mc68030__");
break; break;
case CK_68040: case CK_68040:
Builder.defineMacro("mc68040"); DefineStd(Builder, "mc68040", Opts);
Builder.defineMacro("__mc68040");
Builder.defineMacro("__mc68040__");
break; break;
case CK_68060: case CK_68060:
Builder.defineMacro("mc68060"); DefineStd(Builder, "mc68060", Opts);
Builder.defineMacro("__mc68060");
Builder.defineMacro("__mc68060__");
break; break;
default: default:
break; break;
} }
if (CPU >= CK_68020) { if (CPU >= CK_68020) {
Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1"); Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1");
Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2"); Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2");
▲ Show 20 Lines • Show All 134 Lines • Show Last 20 Lines

clang/test/Driver/m68k-macros.cpp

// Check macro definitions // Check macro definitions
// Since '__HAVE_68881__' sorted before most of the 'mc680x0' macros, we need to put it here. // Since '__HAVE_68881__' sorted before most of the 'mc680x0' macros, we need to put it here.
// CHECK-MX881: #define __HAVE_68881__ 1 // CHECK-MX881: #define __HAVE_68881__ 1
// CHECK-NOMX881-NOT: #define __HAVE_68881__ 1 // CHECK-NOMX881-NOT: #define __HAVE_68881__ 1
// RUN: %clang -target m68k-unknown-linux -m68000 -dM -E %s | FileCheck --check-prefixes=CHECK-MX,CHECK-NOMX881 %s // RUN: %clang -target m68k-unknown-linux -m68000 -std=c++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX,CHECK-NOMX881 %s
// RUN: %clang -target m68k-unknown-linux -m68000 -std=gnu++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX,CHECK-MX-GNU,CHECK-NOMX881 %s
// RUN: %clang -target m68k-unknown-linux -m68000 -mhard-float -dM -E %s | FileCheck --check-prefix=CHECK-MX881 %s // RUN: %clang -target m68k-unknown-linux -m68000 -mhard-float -dM -E %s | FileCheck --check-prefix=CHECK-MX881 %s
// RUN: %clang -target m68k-unknown-linux -m68000 -m68881 -dM -E %s | FileCheck --check-prefix=CHECK-MX881 %s // RUN: %clang -target m68k-unknown-linux -m68000 -m68881 -dM -E %s | FileCheck --check-prefix=CHECK-MX881 %s
// CHECK-MX: #define __mc68000 1 // CHECK-MX: #define __mc68000 1
// CHECK-MX: #define __mc68000__ 1 // CHECK-MX: #define __mc68000__ 1
// CHECK-MX: #define mc68000 1 // CHECK-MX-GNU: #define mc68000 1
// RUN: %clang -target m68k-unknown-linux -m68010 -dM -E %s | FileCheck --check-prefixes=CHECK-MX10,CHECK-NOMX881 %s // RUN: %clang -target m68k-unknown-linux -m68010 -std=c++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX10,CHECK-NOMX881 %s
// RUN: %clang -target m68k-unknown-linux -m68010 -std=gnu++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX10,CHECK-MX10-GNU,CHECK-NOMX881 %s
// RUN: %clang -target m68k-unknown-linux -m68010 -mhard-float -dM -E %s | FileCheck --check-prefix=CHECK-MX881 %s // RUN: %clang -target m68k-unknown-linux -m68010 -mhard-float -dM -E %s | FileCheck --check-prefix=CHECK-MX881 %s
// RUN: %clang -target m68k-unknown-linux -m68010 -m68881 -dM -E %s | FileCheck --check-prefix=CHECK-MX881 %s // RUN: %clang -target m68k-unknown-linux -m68010 -m68881 -dM -E %s | FileCheck --check-prefix=CHECK-MX881 %s
// CHECK-MX10: #define __mc68000 1 // CHECK-MX10: #define __mc68000 1
// CHECK-MX10: #define __mc68000__ 1 // CHECK-MX10: #define __mc68000__ 1
// CHECK-MX10: #define __mc68010 1 // CHECK-MX10: #define __mc68010 1
// CHECK-MX10: #define __mc68010__ 1 // CHECK-MX10: #define __mc68010__ 1
// CHECK-MX10: #define mc68000 1 // CHECK-MX10-GNU: #define mc68000 1
// CHECK-MX10: #define mc68010 1 // CHECK-MX10-GNU: #define mc68010 1
// RUN: %clang -target m68k-unknown-linux -m68020 -dM -E %s | FileCheck --check-prefixes=CHECK-MX20,CHECK-MX881 %s // RUN: %clang -target m68k-unknown-linux -m68020 -std=c++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX20,CHECK-MX881 %s
// RUN: %clang -target m68k-unknown-linux -m68020 -std=gnu++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX20,CHECK-MX20-GNU,CHECK-MX881 %s
// RUN: %clang -target m68k-unknown-linux -m68020 -msoft-float -dM -E %s | FileCheck --check-prefix=CHECK-NOMX881 %s // RUN: %clang -target m68k-unknown-linux -m68020 -msoft-float -dM -E %s | FileCheck --check-prefix=CHECK-NOMX881 %s
// CHECK-MX20: #define __mc68000 1 // CHECK-MX20: #define __mc68000 1
// CHECK-MX20: #define __mc68000__ 1 // CHECK-MX20: #define __mc68000__ 1
// CHECK-MX20: #define __mc68020 1 // CHECK-MX20: #define __mc68020 1
// CHECK-MX20: #define __mc68020__ 1 // CHECK-MX20: #define __mc68020__ 1
// CHECK-MX20: #define mc68000 1 // CHECK-MX20-GNU: #define mc68000 1
// CHECK-MX20: #define mc68020 1 // CHECK-MX20-GNU: #define mc68020 1
// RUN: %clang -target m68k-unknown-linux -m68030 -dM -E %s | FileCheck --check-prefixes=CHECK-MX30,CHECK-MX881 %s // RUN: %clang -target m68k-unknown-linux -m68030 -std=c++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX30,CHECK-MX881 %s
// RUN: %clang -target m68k-unknown-linux -m68030 -std=gnu++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX30,CHECK-MX30-GNU,CHECK-MX881 %s
// RUN: %clang -target m68k-unknown-linux -m68030 -msoft-float -dM -E %s | FileCheck --check-prefix=CHECK-NOMX881 %s // RUN: %clang -target m68k-unknown-linux -m68030 -msoft-float -dM -E %s | FileCheck --check-prefix=CHECK-NOMX881 %s
// CHECK-MX30: #define __mc68000 1 // CHECK-MX30: #define __mc68000 1
// CHECK-MX30: #define __mc68000__ 1 // CHECK-MX30: #define __mc68000__ 1
// CHECK-MX30: #define __mc68030 1 // CHECK-MX30: #define __mc68030 1
// CHECK-MX30: #define __mc68030__ 1 // CHECK-MX30: #define __mc68030__ 1
// CHECK-MX30: #define mc68000 1 // CHECK-MX30-GNU: #define mc68000 1
// CHECK-MX30: #define mc68030 1 // CHECK-MX30-GNU: #define mc68030 1
// RUN: %clang -target m68k-unknown-linux -m68040 -dM -E %s | FileCheck --check-prefixes=CHECK-MX40,CHECK-MX881 %s // RUN: %clang -target m68k-unknown-linux -m68040 -std=c++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX40,CHECK-MX881 %s
// RUN: %clang -target m68k-unknown-linux -m68040 -std=gnu++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX40,CHECK-MX40-GNU,CHECK-MX881 %s
// RUN: %clang -target m68k-unknown-linux -m68040 -msoft-float -dM -E %s | FileCheck --check-prefix=CHECK-NOMX881 %s // RUN: %clang -target m68k-unknown-linux -m68040 -msoft-float -dM -E %s | FileCheck --check-prefix=CHECK-NOMX881 %s
// CHECK-MX40: #define __mc68000 1 // CHECK-MX40: #define __mc68000 1
// CHECK-MX40: #define __mc68000__ 1 // CHECK-MX40: #define __mc68000__ 1
// CHECK-MX40: #define __mc68040 1 // CHECK-MX40: #define __mc68040 1
// CHECK-MX40: #define __mc68040__ 1 // CHECK-MX40: #define __mc68040__ 1
// CHECK-MX40: #define mc68000 1 // CHECK-MX40-GNU: #define mc68000 1
// CHECK-MX40: #define mc68040 1 // CHECK-MX40-GNU: #define mc68040 1
// RUN: %clang -target m68k-unknown-linux -m68060 -dM -E %s | FileCheck --check-prefixes=CHECK-MX60,CHECK-MX881 %s // RUN: %clang -target m68k-unknown-linux -m68060 -std=c++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX60,CHECK-MX881 %s
// RUN: %clang -target m68k-unknown-linux -m68060 -std=gnu++11 -dM -E %s | FileCheck --check-prefixes=CHECK-MX60,CHECK-MX60-GNU,CHECK-MX881 %s
// RUN: %clang -target m68k-unknown-linux -m68060 -msoft-float -dM -E %s | FileCheck --check-prefix=CHECK-NOMX881 %s // RUN: %clang -target m68k-unknown-linux -m68060 -msoft-float -dM -E %s | FileCheck --check-prefix=CHECK-NOMX881 %s
// CHECK-MX60: #define __mc68000 1 // CHECK-MX60: #define __mc68000 1
// CHECK-MX60: #define __mc68000__ 1 // CHECK-MX60: #define __mc68000__ 1
// CHECK-MX60: #define __mc68060 1 // CHECK-MX60: #define __mc68060 1
// CHECK-MX60: #define __mc68060__ 1 // CHECK-MX60: #define __mc68060__ 1
// CHECK-MX60: #define mc68000 1 // CHECK-MX60-GNU: #define mc68000 1
// CHECK-MX60: #define mc68060 1 // CHECK-MX60-GNU: #define mc68060 1