From: doko@ubuntu.com <doko@ubuntu.com>
Date: Sat, 4 Jun 2016 22:44:01 +0000 (+0200)
Subject:  - merge 3.5
X-Git-Tag: v3.6.0a2~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36987d7c8d93eebde28404dd1e8789f54780afa6;p=python

 - merge 3.5
---

36987d7c8d93eebde28404dd1e8789f54780afa6
diff --cc Misc/NEWS
index 0dc317e228,8b82531d38..2cef4570ea
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1286,9 -561,9 +1286,12 @@@ Test
  Build
  -----
  
+ - Issue #26884: Fix linking extension modules for cross builds.
+   Patch by Xavier de Gaye.
+ 
 +- Issue #26932: Fixed support of RTLD_* constants defined as enum values,
 +  not via macros (in particular on Android).  Patch by Chi Hsuan Yen.
 +
  - Issue #22359: Disable the rules for running _freeze_importlib and pgen when
    cross-compiling.  The output of these programs is normally saved with the
    source code anyway, and is still regenerated when doing a native build.