Snap for 8730993 from f17a9ee1aa3b271f90b5b5812b286a0f632582df to mainline-tzdata3-release
Change-Id: Icd217096177df6900047422ee4415943821b2ccc
diff --git a/Android.bp b/Android.bp
index b13d7e4..0289573 100644
--- a/Android.bp
+++ b/Android.bp
@@ -114,17 +114,10 @@
linux_glibc_x86: {
enabled: false,
},
- linux_musl_x86: {
- enabled: false,
- },
linux_glibc_x86_64: {
local_include_dirs: ["linux_x86_64/pyconfig"],
cflags: ["-Werror"],
},
- linux_musl_x86_64: {
- local_include_dirs: ["linux_x86_64/pyconfig"],
- cflags: ["-Werror"],
- },
windows: {
enabled: false,
},
@@ -983,7 +976,13 @@
"Modules/_ctypes/libffi/src/x86/darwin64.S",
],
},
- host_linux: {
+ linux_bionic: {
+ local_include_dirs: ["linux_x86_64/libffi"],
+ srcs: [
+ "Modules/_ctypes/libffi/src/x86/unix64.S",
+ ],
+ },
+ linux_glibc_x86_64: {
local_include_dirs: ["linux_x86_64/libffi"],
srcs: [
"Modules/_ctypes/libffi/src/x86/unix64.S",
diff --git a/linux_x86_64/pyconfig/pyconfig.h b/linux_x86_64/pyconfig/pyconfig.h
index e6c363d..210484d 100644
--- a/linux_x86_64/pyconfig/pyconfig.h
+++ b/linux_x86_64/pyconfig/pyconfig.h
@@ -858,10 +858,7 @@
#define HAVE_TMPNAM 1
/* Define to 1 if you have the `tmpnam_r' function. */
-#ifdef __GLIBC__
-// musl does not have tmpnam_r
#define HAVE_TMPNAM_R 1
-#endif
/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
`HAVE_STRUCT_TM_TM_ZONE' instead. */
