Fix argv passing in PROXY_TO_PTHREAD mode

This was broken in #17153 but we didn't have any tests.

Fixes: #17338

Author: sbc100

emcc.py

@@ -1747,9 +1747,7 @@ def phase_linker_setup(options, state, newargs, user_settings):
         settings.EXPECT_MAIN = 0
     else:
       assert not settings.EXPORTED_FUNCTIONS
-      # With PROXY_TO_PTHREAD we don't export `main` at all but instead `_emscripten_proxy_main`.
-      if not settings.PROXY_TO_PTHREAD:
-        settings.EXPORTED_FUNCTIONS = ['_main']
+      settings.EXPORTED_FUNCTIONS = ['_main']
 
   if settings.STANDALONE_WASM:
     # In STANDALONE_WASM mode we either build a command or a reactor.

tests/pthread/test_pthread_argv.cpp

@@ -0,0 +1,11 @@
+#include <stdio.h>
+
+int main(int argc, char* argv[]) {
+  printf("%d\n", argc);
+  // Skip arg 0 because it will be an absolute path that varies between
+  // machines.
+  for (int i = 1; i < argc; i++) {
+    printf("%d: %s\n", i, argv[i]);
+  }
+  return 0;
+}

tests/pthread/test_pthread_argv.out

@@ -0,0 +1,3 @@
+3
+1: hello
+2: world

tests/test_core.py

@@ -2833,6 +2833,12 @@ def test_pthread_stdout_after_main(self):
     # streams were locked when the main thread returned.
     self.do_runf(test_file('pthread/test_pthread_stdout_after_main.c'))
 
+  @node_pthreads
+  def test_pthread_argv(self):
+    self.set_setting('PROXY_TO_PTHREAD')
+    self.set_setting('EXIT_RUNTIME')
+    self.do_run_in_out_file_test('pthread/test_pthread_argv.cpp', args=['hello', 'world'])
+
   def test_tcgetattr(self):
     self.do_runf(test_file('termios/test_tcgetattr.c'), 'success')