From 224bca44987a2298d9ac9fa97f6ad4f6838e9073 Mon Sep 17 00:00:00 2001
From: Vedant Kumar <vsk@apple.com>
Date: Tue, 25 Feb 2020 14:37:59 -0800
Subject: [PATCH] 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.
---
 lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
index ce28eaedcfc..0c789061f0e 100644
--- a/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h
+++ b/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.