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

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