[PATCH] D75091: [X86MCTargetDesc.h] Speculative fix for macro collision with sys/param.h

[Vedant Kumar via Phabricator via llvm-commits]

vsk updated this revision to Diff 246513.
vsk retitled this revision from "[modulemap] Speculative fix for macro collision with sys/param.h" to "[X86MCTargetDesc.h] Speculative fix for macro collision with sys/param.h".
vsk added a comment.
Herald added a subscriber: hiraditya.

I tested out doing `#undef FSCALE`, and this resolved the build breakage on our bot.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D75091/new/

https://reviews.llvm.org/D75091

Files:
  llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h


Index: llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
===================================================================
--- llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
+++ llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
@@ -125,6 +125,10 @@
 
 } // End llvm namespace
 
+// Some Unix systems define an FSCALE macro in sys/param.h. This macro somehow
+// gets pulled into this header when -fmodules is enabled, preventing us from
+// textually including X86GenInstrInfo.inc.
+#undef FSCALE
 
 // Defines symbolic names for X86 registers.  This defines a mapping from
 // register name to register number.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75091.246513.patch
Type: text/x-patch
Size: 620 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200225/d969d636/attachment.bin>