Change to 64 for RV32/RV64

Author: wangpc-pp

clang/lib/Basic/Targets/RISCV.h

@@ -125,6 +125,10 @@ class RISCVTargetInfo : public TargetInfo {
   ParsedTargetAttr parseTargetAttr(StringRef Str) const override;
   llvm::APInt getFMVPriority(ArrayRef<StringRef> Features) const override;
 
+  std::pair<unsigned, unsigned> hardwareInterferenceSizes() const override {
+    return std::make_pair(64, 64);
+  }
+
   bool supportsCpuSupports() const override { return getTriple().isOSLinux(); }
   bool supportsCpuIs() const override { return getTriple().isOSLinux(); }
   bool supportsCpuInit() const override { return getTriple().isOSLinux(); }
@@ -174,10 +178,6 @@ class LLVM_LIBRARY_VISIBILITY RISCV32TargetInfo : public RISCVTargetInfo {
     resetDataLayout("e-m:e-p:32:32-i64:64-n32-S128");
   }
 
-  std::pair<unsigned, unsigned> hardwareInterferenceSizes() const override {
-    return std::make_pair(32, 32);
-  }
-
   bool setABI(const std::string &Name) override {
     if (Name == "ilp32e") {
       ABI = Name;
@@ -209,10 +209,6 @@ class LLVM_LIBRARY_VISIBILITY RISCV64TargetInfo : public RISCVTargetInfo {
     resetDataLayout("e-m:e-p:64:64-i64:64-i128:128-n32:64-S128");
   }
 
-  std::pair<unsigned, unsigned> hardwareInterferenceSizes() const override {
-    return std::make_pair(64, 64);
-  }
-
   bool setABI(const std::string &Name) override {
     if (Name == "lp64e") {
       ABI = Name;

clang/test/Preprocessor/init-riscv.c

@@ -5,8 +5,8 @@
 // RUN: %clang_cc1 -E -dM -triple=riscv64 < /dev/null | \
 // RUN:     FileCheck -match-full-lines -check-prefixes=RV64 %s
 
-// RV32: #define __GCC_CONSTRUCTIVE_SIZE 32
-// RV32: #define __GCC_DESTRUCTIVE_SIZE 32
+// RV32: #define __GCC_CONSTRUCTIVE_SIZE 64
+// RV32: #define __GCC_DESTRUCTIVE_SIZE 64
 
 // RV64: #define __GCC_CONSTRUCTIVE_SIZE 64
 // RV64: #define __GCC_DESTRUCTIVE_SIZE 64