diff --git a/common.mk b/common.mk index 76f7ce018..07548f6e8 100644 --- a/common.mk +++ b/common.mk @@ -212,12 +212,6 @@ get-sandbox-cxxtext-for = "('$(1)' CXXFLAGS for sandboxes)" files-that-contain = $(strip $(foreach f, $(1), $(if $(findstring $(2),$(f)),$(f),))) files-that-dont-contain = $(strip $(foreach f, $(1), $(if $(findstring $(2),$(f)),,$(f)))) -# Define a function that removes duplicate words from a list. -# NOTE: This function was obtained via [1]; thanks bobbogo for this -# concise definition. -# [1] https://stackoverflow.com/questions/16144115/makefile-remove-duplicate-words-without-sorting -rm-dupls = $(if $1,$(firstword $1) $(call rm-dupls,$(filter-out $(firstword $1),$1))) - # # --- Include makefile configuration file -------------------------------------- diff --git a/travis/patch-ld-so.py b/travis/patch-ld-so.py index 72e580d74..4eb85bafa 100755 --- a/travis/patch-ld-so.py +++ b/travis/patch-ld-so.py @@ -1,16 +1,3 @@ #!/usr/bin/env python -# -# Patch ld.so to disable runtime CPUID detection -# Taken from https://stackoverflow.com/a/44483482 -# - -import re -import sys - -infile, outfile = sys.argv[1:] -d = open(infile, 'rb').read() -# Match CPUID(eax=0), "xor eax,eax" followed closely by "cpuid" -o = re.sub(b'(\x31\xc0.{0,32})\x0f\xa2', b'\\1\x66\x90', d) -#assert d != o -open(outfile, 'wb').write(o) +# Stub file in AMD repository as it is not needed