[llvm] 8594f3d - Revert "[X86MCTargetDesc.h] Speculative fix for macro collision with sys/param.h"

[Vedant Kumar via llvm-commits]

Author: Vedant Kumar
Date: 2020-02-25T14:38:46-08:00
New Revision: 8594f3d8990960f062b8ed5184f7d7cc9337e78f

URL: https://github.com/llvm/llvm-project/commit/8594f3d8990960f062b8ed5184f7d7cc9337e78f
DIFF: https://github.com/llvm/llvm-project/commit/8594f3d8990960f062b8ed5184f7d7cc9337e78f.diff

LOG: Revert "[X86MCTargetDesc.h] Speculative fix for macro collision with sys/param.h"

This reverts commit eee22ec3c3712a1089cbdbe66ccf36dd89be507a.

This is not the correct fix, the root cause seems to be a bug in the
stage1 host clang compiler. See https://reviews.llvm.org/D75091 for more
discussion.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
index ce28eaedcfc8..0c789061f0e1 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
@@ -125,10 +125,6 @@ MCRegister getX86SubSuperRegisterOrZero(MCRegister, unsigned,
 
 } // 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.