Issue #18603: Ensure that PyOS_mystricmp and PyOS_mystrnicmp are in the

Python executable and not removed by the linker's optimizer.

diff --cc Misc/NEWS
index 84f6e2c9bbb6f855aaed9f329f01cbd5888287f0,c2cb8504d9eb388b16aea589c152cedd9f160d04..06483aa3e5d8fc9e8b22396356a9d5f94a14f207
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,77 -12,71 +10,83 @@@ Projected release date: 2013-11-2
  Core and Builtins
  -----------------
  
 -- Issue #19279: UTF-7 decoder no more produces illegal strings.
+ - Issue #18603: Ensure that PyOS_mystricmp and PyOS_mystrnicmp are in the
+   Python executable and not removed by the linker's optimizer.
+ 
 +- Issue #19306: Add extra hints to the faulthandler module's stack
 +  dumps that these are "upside down".
  
 -- Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at
 -  least one place so as to avoid regressions.
 +Library
 +-------
  
 -- Issue #19014: memoryview.cast() is now allowed on zero-length views.
 +- Issue #17400: ipaddress should make it easy to identify rfc6598 addresses.
  
 -- Issue #19098: Prevent overflow in the compiler when the recursion limit is set
 -  absurdly high.
 +- Load SSL's error strings in hashlib.
  
 -- Issue #18942: sys._debugmallocstats() output was damaged on Windows.
 +- Issue #18527: Upgrade internal copy of zlib to 1.2.8.
  
 -- Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.
 +- Issue #19274: Add a filterfunc parameter to PyZipFile.writepy.
  
 -- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
 -  fails.
  
 -- Issue #16741: Fix an error reporting in int().
 +What's New in Python 3.4.0 Alpha 4?
 +===================================
  
 -- Issue #17899: Fix rare file descriptor leak in os.listdir().
 +Release date: 2013-10-20
  
 -- Issue #18552: Check return value of PyArena_AddPyObject() in
 -  obj2ast_object().
 +Core and Builtins
 +-----------------
  
 -- Issue #18560: Fix potential NULL pointer dereference in sum().
 +- Issue #19301: Give classes and functions that are explicitly marked global a
 +  global qualname.
  
 -- Issue #15905: Fix theoretical buffer overflow in handling of sys.argv[0],
 -  prefix and exec_prefix if the operation system does not obey MAXPATHLEN.
 +- Issue #19279: UTF-7 decoder no longer produces illegal strings.
  
 -- Issue #18344: Fix potential ref-leaks in _bufferedreader_read_all().
 +- Issue #16612: Add "Argument Clinic", a compile-time preprocessor for
 +  C files to generate argument parsing code.  (See PEP 436.)
  
 -- Issue #17872: Fix a segfault in marshal.load() when input stream returns
 -  more bytes than requested.
 +- Issue #18810: Shift stat calls in importlib.machinery.FileFinder such that
 +  the code is optimistic that if something exists in a directory named exactly
 +  like the possible package being searched for that it's in actuality a
 +  directory.
  
 -- Issue #18426: Fix NULL pointer dereference in C extension import when
 -  PyModule_GetDef() returns an error.
 +- Issue #18416: importlib.machinery.PathFinder now treats '' as the cwd and
 +  importlib.machinery.FileFinder no longer special-cases '' to '.'. This leads
 +  to modules imported from cwd to now possess an absolute file path for
 +  __file__ (this does not affect modules specified by path on the CLI but it
 +  does affect -m/runpy). It also allows FileFinder to be more consistent by not
 +  having an edge case.
  
 -- Issue #18328: Reorder ops in PyThreadState_Delete*() functions. Now the
 -  tstate is first removed from TLS and then deallocated.
 +- Issue #4555: All exported C symbols are now prefixed with either
 +  "Py" or "_Py".
  
 -- Issue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
 -  OverflowError when an argument of %c format is out of range.
 +- Issue #19219: Speed up marshal.loads(), and make pyc files slightly
 +  (5% to 10%) smaller.
  
 -- Issue #18137: Detect integer overflow on precision in float.__format__()
 -  and complex.__format__().
 +- Issue #19221: Upgrade Unicode database to version 6.3.0.
  
 -- Issue #18183: Fix various unicode operations on strings with large unicode
 -  codepoints.
 +- Issue #16742: The result of the C callback PyOS_ReadlineFunctionPointer must
 +  now be a string allocated by PyMem_RawMalloc() or PyMem_RawRealloc() (or NULL
 +  if an error occurred), instead of a string allocated by PyMem_Malloc() or
 +  PyMem_Realloc().
  
 -- Issue #18180: Fix ref leak in _PyImport_GetDynLoadWindows().
 +- Issue #19199: Remove ``PyThreadState.tick_counter`` field
++=======
++- Issue #19279: UTF-7 decoder no more produces illegal strings.
++>>>>>>> other
  
 -- Issue #18038: SyntaxError raised during compilation sources with illegal
 -  encoding now always contains an encoding name.
 +- Fix macro expansion of _PyErr_OCCURRED(), and make sure to use it in at
 +  least one place so as to avoid regressions.
  
 -- Issue #17644: Fix a crash in str.format when curly braces are used in square
 -  brackets.
 +- Issue #19087: Improve bytearray allocation in order to allow cheap popping
 +  of data at the front (slice deletion).
  
 -- Issue #17983: Raise a SyntaxError for a ``global __class__`` statement in a
 -  class body.
 +- Issue #19014: memoryview.cast() is now allowed on zero-length views.
 +
 +- Issue #18690: memoryview is now automatically registered with
 +  collections.abc.Sequence
  
 -- Issue #17927: Frame objects kept arguments alive if they had been copied into
 -  a cell, even if the cell was cleared.
 +- Issue #19078: memoryview now correctly supports the reversed builtin
 +  (Patch by Claudiu Popa)
  
  Library
  -------

diff --cc Python/pythonrun.c
Simple merge