Distinguish only between __declspec and __attribute__

2 files changed, 10 insertions, 10 deletions

diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 4743e4576..8e532739b 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -677,10 +677,10 @@ proc genProcAux(m: BModule, prc: PSym) =
   genStmts(p, prc.getBody) # modifies p.locals, p.init, etc.
   var generatedProc: Rope
   if sfNoReturn in prc.flags:
-    if hasNoreturnDeclspec in extccomp.CC[extccomp.cCompiler].props:
+    if {hasNoreturn, hasDeclspec} <= extccomp.CC[extccomp.cCompiler].props:
       header = "__declspec(noreturn) " & header
   if sfPure in prc.flags:
-    if hasNakedDeclspec in extccomp.CC[extccomp.cCompiler].props:
+    if {hasNaked, hasDeclspec} <= extccomp.CC[extccomp.cCompiler].props:
       header = "__declspec(naked) " & header
     generatedProc = rfmt(nil, "$N$1 {$n$2$3$4}$N$N",
                          header, p.s(cpsLocals), p.s(cpsInit), p.s(cpsStmts))
@@ -723,9 +723,9 @@ proc genProcPrototype(m: BModule, sym: PSym) =
     var header = genProcHeader(m, sym)
     if sym.typ.callConv != ccInline and crossesCppBoundary(m, sym):
       header = "extern \"C\" " & header
-    if sfPure in sym.flags and hasNakedAttribute in CC[cCompiler].props:
+    if sfPure in sym.flags and {hasNaked, hasAttribute} <= CC[cCompiler].props:
       header.add(" __attribute__((naked))")
-    if sfNoReturn in sym.flags and hasNoreturnAttribute in CC[cCompiler].props:
+    if sfNoReturn in sym.flags and {hasNoreturn, hasAttribute} <= CC[cCompiler].props:
       header.add(" __attribute__((noreturn))")
     add(m.s[cfsProcHeaders], rfmt(nil, "$1;$n", header))
 
diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim
index 1bf4eb757..3d4d1a3a5 100644
--- a/compiler/extccomp.nim
+++ b/compiler/extccomp.nim
@@ -26,10 +26,10 @@ type
     hasAssume,                # CC has __assume (Visual C extension)
     hasGcGuard,               # CC supports GC_GUARD to keep stack roots
     hasGnuAsm,                # CC's asm uses the absurd GNU assembler syntax
-    hasNakedDeclspec,         # CC has __declspec(naked)
-    hasNakedAttribute,        # CC has __attribute__((naked))
-    hasNoreturnAttribute,     # CC has __attribute__((noreturn))
-    hasNoreturnDeclspec       # CC has __declspec(noreturn)
+    hasDeclspec,              # CC has __declspec(X)
+    hasAttribute,             # CC has __attribute__((X))
+    hasNaked,                 # CC has naked declspec/attribute
+    hasNoreturn               # CC has noreturn declspec/attribute
   TInfoCCProps* = set[TInfoCCProp]
   TInfoCC* = tuple[
     name: string,        # the short name of the compiler
@@ -87,7 +87,7 @@ compiler gcc:
     structStmtFmt: "$1 $3 $2 ", # struct|union [packed] $name
     packedPragma: "__attribute__((__packed__))",
     props: {hasSwitchRange, hasComputedGoto, hasCpp, hasGcGuard, hasGnuAsm,
-            hasNakedAttribute, hasNoreturnAttribute})
+            hasAttribute, hasNaked, hasNoreturn})
 
 # LLVM Frontend for GCC/G++
 compiler llvmGcc:
@@ -129,7 +129,7 @@ compiler vcc:
     asmStmtFrmt: "__asm{$n$1$n}$n",
     structStmtFmt: "$3$n$1 $2",
     packedPragma: "#pragma pack(1)",
-    props: {hasCpp, hasAssume, hasNakedDeclspec, hasNoreturnDeclspec})
+    props: {hasCpp, hasAssume, hasDeclspec, hasNaked, hasNoreturn})
 
 # Intel C/C++ Compiler
 compiler icl: