Changeset 7770cc8 for libcfa/prelude/bootloader.cf

Timestamp:

Nov 24, 2021, 9:47:56 PM (2 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

5235d49

Parents:

94647b0 (diff), 3cc1111 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/prelude/bootloader.cf (modified) (2 diffs)

libcfa/prelude/bootloader.cf

@@ -3 +3 @@
 char ** cfa_args_argv;
 char ** cfa_args_envp;
-int cfa_main_returned = 0;
+__attribute__((weak)) extern int cfa_main_returned;
 
 int main(int argc, char* argv[], char* envp[]) {
@@ -10 +10 @@
         cfa_args_envp = envp;
         int ret = invoke_main(argc, argv, envp);
-        cfa_main_returned = 1;
+        if(&cfa_main_returned) cfa_main_returned = 1;
         return ret;
 }