aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xscripts/build-many-glibcs.py11
2 files changed, 5 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f2ccefa02..736d85f221 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-26 Joseph Myers <joseph@codesourcery.com>
+
+ * scripts/build-many-glibcs.py: Remove compatibility for missing
+ os.cpu_count and re.fullmatch.
+
2018-10-26 Szabolcs Nagy <szabolcs.nagy@arm.com>
[BZ #23822]
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index 3f288e0e0b..1bf8ee1d2b 100755
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -50,17 +50,6 @@ import time
import urllib.request
try:
- os.cpu_count
-except:
- import multiprocessing
- os.cpu_count = lambda: multiprocessing.cpu_count()
-
-try:
- re.fullmatch
-except:
- re.fullmatch = lambda p,s,f=0: re.match(p+"\\Z",s,f)
-
-try:
subprocess.run
except:
class _CompletedProcess: