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

Commits:

2 changed files:

Changes:

  • rts/js/mem.js
    1 1
     //#OPTIONS:CPP
    
    2
    -//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot
    
    2
    +//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot,HEAP8
    
    3 3
     
    
    4 4
     // #define GHCJS_TRACE_META 1
    
    5 5
     
    

  • testsuite/driver/testlib.py
    ... ... @@ -3004,6 +3004,8 @@ def normalise_errmsg(s: str) -> str:
    3004 3004
         s = re.sub('.*warning: argument unused during compilation:.*\n', '', s)
    
    3005 3005
         # Emscripten displays cache info and old emcc doesn't support EMCC_LOGGING=0
    
    3006 3006
         s = re.sub('cache:INFO: .*\n', '', s)
    
    3007
    +    # Old emcc warns when we export HEAP8 but new one requires it (see #26290)
    
    3008
    +    s = s.replace('warning: invalid item in EXPORTED_RUNTIME_METHODS: HEAP8\nemcc: warning: warnings in JS library compilation [-Wjs-compiler]\n','')
    
    3007 3009
     
    
    3008 3010
         return s
    
    3009 3011