Remove command line definition of EMSCRIPTEN

In #26381, the definition of this macro was moved into the
`emscripten.h` header file, along with a warning if its used.

This change removes this macro from the clang command line generated by
emcc, reducing the differences between using `emcc` and using `clang
 -target=wasm32-emscripten` directly.

Author: sbc100

ChangeLog.md

@@ -20,6 +20,8 @@ See docs/process.md for more on how version tagging works.
 
 5.0.3 (in development)
 ----------------------
+- The deprecated `EMSCRIPTEN` macro is now defined in emscripten.h rather than
+  on the command line. (#26417)
 - Warn on usage of the deprecated `EMSCRIPTEN` macro (`__EMSCRIPTEN__` should
   be used instead). (#26381)
 - The `-sRELOCATABLE` setting was effectively removed (moved to legacy

src/settings.js

@@ -1160,8 +1160,6 @@ var LINKABLE = false;
 // codebase builds nicely in forward compatible manner.
 // Changes enabled by this:
 //
-//   - The C define EMSCRIPTEN is not defined (__EMSCRIPTEN__ always is, and
-//     is the correct thing to use).
 //   - STRICT_JS is enabled.
 //   - IGNORE_MISSING_MAIN is disabled.
 //   - AUTO_JS_LIBRARIES is disabled.

test/core/test_core_types.c

@@ -75,15 +75,6 @@
 #error __BIG_ENDIAN__ is defined
 #endif
 
-// We prefer to use __EMSCRIPTEN__, but for compatibility, we define
-// EMSCRIPTEN too.
-#if defined(IN_STRICT_MODE) && defined(EMSCRIPTEN)
-#error When compiling in -sSTRICT mode, EMSCRIPTEN should not be defined, but it was!
-#endif
-#if !defined(IN_STRICT_MODE) && !defined(EMSCRIPTEN)
-#error EMSCRIPTEN is not defined
-#endif
-
 #include <stdalign.h>
 #include <stdint.h>
 #include <stddef.h>

test/test_browser.py

@@ -3191,7 +3191,7 @@ def test_sdl3_canvas_write(self):
   def test_cocos2d_hello(self):
     # cocos2d build contains a bunch of warnings about tiff symbols being missing at link time:
     # e.g. warning: undefined symbol: TIFFClientOpen
-    cocos2d_root = os.path.join(ports.Ports.get_dir(), 'cocos2d', 'Cocos2d-version_3_3')
+    cocos2d_root = os.path.join(ports.Ports.get_dir(), 'cocos2d', 'Cocos2d-version_3_3r1')
     preload_file = os.path.join(cocos2d_root, 'samples', 'Cpp', 'HelloCpp', 'Resources') + '@'
     self.reftest('cocos2d_hello.cpp', reference_slack=1,
                  cflags=['-sUSE_COCOS2D=3', '-sERROR_ON_UNDEFINED_SYMBOLS=0',

test/test_core.py

@@ -677,8 +677,6 @@ def test_sha1(self):
     self.do_runf('third_party/sha1.c', 'SHA1=15dd99a1991e0b3826fede3deffc1feba42278e6')
 
   def test_core_types(self):
-    if self.get_setting('STRICT'):
-      self.cflags += ['-DIN_STRICT_MODE=1']
     self.do_runf('core/test_core_types.c')
 
   def test_cube2md5(self):

test/test_other.py

@@ -11303,17 +11303,6 @@ def test_EMSCRIPTEN_macro(self):
     self.assert_fail([EMCC, '-Werror', 'src.c', '-c'], "'EMSCRIPTEN' has been marked as deprecated: use __EMSCRIPTEN__ instead")
     self.assert_fail([EMCC, '-sSTRICT', '-Werror', 'src.c', '-c'], "'EMSCRIPTEN' has been marked as deprecated: use __EMSCRIPTEN__ instead")
 
-  def test_EMSCRIPTEN_and_STRICT(self):
-    # __EMSCRIPTEN__ is the proper define; we support EMSCRIPTEN for legacy
-    # code, unless STRICT is enabled.
-    create_file('src.c', '''
-      #ifndef EMSCRIPTEN
-      #error "not defined"
-      #endif
-    ''')
-    self.run_process([EMCC, 'src.c', '-c'])
-    self.expect_fail([EMCC, 'src.c', '-sSTRICT', '-c'])
-
   def test_exception_settings(self):
     for catching, throwing, opts in itertools.product([0, 1], repeat=3):
       cmd = [EMXX, test_file('other/exceptions_modes_symbols_defined.cpp'), '-sDISABLE_EXCEPTION_THROWING=%d' % (1 - throwing), '-sDISABLE_EXCEPTION_CATCHING=%d' % (1 - catching), '-O%d' % opts]

tools/compile.py

@@ -96,11 +96,6 @@ def get_cflags(user_args):
   if settings.WASM_WORKERS:
     cflags.append('-D__EMSCRIPTEN_WASM_WORKERS__=1')
 
-  if not settings.STRICT:
-    # The preprocessor define EMSCRIPTEN is deprecated. Don't pass it to code
-    # in strict mode. Code should use the define __EMSCRIPTEN__ instead.
-    cflags.append('-DEMSCRIPTEN')
-
   ports.add_cflags(cflags, settings)
 
   def array_contains_any_of(hay, needles):

tools/ports/cocos2d.py

@@ -8,8 +8,8 @@
 
 from tools import diagnostics
 
-TAG = 'version_3_3'
-HASH = 'd7b22660036c684f09754fcbbc7562984f02aa955eef2b76555270c63a717e6672c4fe695afb16280822e8b7c75d4b99ae21975a01a4ed51cad957f7783722cd'
+TAG = 'version_3_3r1'
+HASH = '28037e54bef4ff5363a2a185245afc4670d1664dbded1a13459fef3bcbcd18f61c3df1404415e89aa69cad383637b959a76c4efc7dce55ffaa42a5530b5c9034'
 
 deps = ['libpng', 'zlib']
 
@@ -37,9 +37,6 @@ def create(final):
       '-DCC_KEYBOARD_SUPPORT',
       '-DGL_ES=1',
       '-DNDEBUG', # '-DCOCOS2D_DEBUG=1' 1 - error/warn, 2 - verbose
-      # Cocos2d source code hasn't switched to __EMSCRIPTEN__.
-      # See https://github.com/emscripten-ports/Cocos2d/pull/3
-      '-DEMSCRIPTEN',
       '-DCP_USE_DOUBLES=0',
       '-sUSE_ZLIB',
       '-sUSE_LIBPNG',