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

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