Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64'

as the processor type on some Mac systems.

diff --cc Doc/library/platform.rst
Simple merge

diff --cc Lib/platform.py
Simple merge

diff --cc Lib/test/test_platform.py
Simple merge

diff --cc Misc/NEWS
index be49249bbba91a3fd532efa5182636fedec5e683,6bb9f9f1c1c843d439a80c871f35a8eb31879144..a206a17f127b88c7c00890565189b0eac9192fd6
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1020,73 -693,6 +1020,76 @@@ Extension Module
  Tests
  -----
  
++- Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64'
++  as the processor type on some Mac systems.
++
 +- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary
 +  failure in name resolution.
 +
 +- Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and
 +  an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder
 +  Web site.
 +
 +- Avoid failing in test_urllibnet.test_bad_address when some overzealous
 +  DNS service (e.g. OpenDNS) resolves a non-existent domain name.  The test
 +  is now skipped instead.
 +
 +- Issue #12440: When testing whether some bits in SSLContext.options can be
 +  reset, check the version of the OpenSSL headers Python was compiled against,
 +  rather than the runtime version of the OpenSSL library.
 +
 +- Issue #11512: Add a test suite for the cgitb module. Patch by Robbie Clemons.
 +
 +- Issue #12497: Install test/data to prevent failures of the various codecmaps
 +  tests.
 +
 +- Issue #12496: Install test/capath directory to prevent test_connect_capath
 +  testcase failure in test_ssl.
 +
 +- Issue #12469: Run wakeup and pending signal tests in a subprocess to run the
 +  test in a fresh process with only one thread and to not change signal
 +  handling of the parent process.
 +
 +- Issue #8716: Avoid crashes caused by Aqua Tk on OSX when attempting to run
 +  test_tk or test_ttk_guionly under a username that is not currently logged
 +  in to the console windowserver (as may be the case under buildbot or ssh).
 +
 +- Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows.
 +
 +- Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures
 +  the output and displays it on failure instead. regrtest -v doesn't print the
 +  error twice anymore if there is only one error.
 +
 +- Issue #12141: Install copies of template C module file so that
 +  test_build_ext of test_distutils and test_command_build_ext of
 +  test_packaging are no longer silently skipped when
 +  run outside of a build directory.
 +
 +- Issue #8746: Add additional tests for os.chflags() and os.lchflags().
 +  Patch by Garrett Cooper.
 +
 +- Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
 +  2.8 +  on Mac OS X.  (Patch by Ronald Oussoren)
 +
 +- Issue #12057: Add tests for ISO 2022 codecs (iso2022_jp, iso2022_jp_2,
 +  iso2022_kr).
 +
 +- Issue #12180: Fixed a few remaining errors in test_packaging when no
 +  threading.
 +
 +- Issue #12120, #12119: skip a test in packaging and distutils
 +  if sys.dont_write_bytecode is set to True.
 +
 +- Issue #12096: Fix a race condition in test_threading.test_waitfor(). Patch
 +  written by Charles-François Natali.
 +
 +- Issue #11614: import __hello__ prints "Hello World!". Patch written by
 +  Andreas Stührk.
 +
 +- Issue #5723: Improve json tests to be executed with and without accelerations.
 +
 +- Issue #12041: Make test_wait3 more robust.
 +
  - Issue #11873: Change regex in test_compileall to fix occasional failures when
    when the randomly generated temporary path happened to match the regex.