Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • testsuite/driver/testlib.py
    ... ... @@ -2988,7 +2988,7 @@ def normalise_errmsg(s: str) -> str:
    2988 2988
     
    
    2989 2989
         # filter out unsupported GNU_PROPERTY_TYPE (5), which is emitted by LLVM10
    
    2990 2990
         # and not understood by older binutils (ar, ranlib, ...)
    
    2991
    -    s = modify_lines(s, lambda l: re.sub(r'^(.+)warning: (.+): unsupported GNU_PROPERTY_TYPE \(5\) type: 0xc000000(.*)$', '', l))
    
    2991
    +    s = modify_lines(s, lambda l: re.sub(r'^(.+)warning: (.+): unsupported GNU_PROPERTY_TYPE (?:\(5\) )?type: 0xc000000(.*)$', '', l))
    
    2992 2992
     
    
    2993 2993
         s = re.sub(r'ld: warning: passed .* min versions \(.*\) for platform macOS. Using [\.0-9]+.','',s)
    
    2994 2994
         s = re.sub('ld: warning: -sdk_version and -platform_version are not compatible, ignoring -sdk_version','',s)