Merge "Revert "Revert "X86: Use the constant area for more operations.""" am: e6e0cfd798
am: d1085aedd2

* commit 'd1085aedd202aa61467ad1909465cdc27b76db3c':
  Revert "Revert "X86: Use the constant area for more operations.""