Changeset 7148abf in mainline

Timestamp:

2018-04-28T16:18:07Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e634684

Parents:

3fafe5e0

Message:

Rename main to libc_main, to avoid conflict with libgcc.

Location:

uspace/lib/c

Files:

• arch/abs32le/src/entry.c (modified) (1 diff)
• arch/amd64/src/entry.S (modified) (1 diff)
• arch/arm32/src/entry.S (modified) (1 diff)
• arch/ia32/src/entry.S (modified) (1 diff)
• arch/ia64/src/entry.S (modified) (1 diff)
• arch/mips32/src/entry.S (modified) (1 diff)
• arch/ppc32/src/entry.S (modified) (1 diff)
• arch/riscv64/src/entry.c (modified) (1 diff)
• arch/sparc64/src/entry.S (modified) (1 diff)
• generic/libc.c (modified) (1 diff)
• generic/private/libc.h (modified) (1 diff)

uspace/lib/c/arch/abs32le/src/entry.c

@@ -39 +39 @@
 void __entry(void)
 {
-        __main(NULL);
+        __libc_main(NULL);
 }
 

uspace/lib/c/arch/amd64/src/entry.S

@@ -46 +46 @@
 
         # %rdi was deliberately chosen as the first argument is also in %rdi
-        # Pass PCB pointer to __main (no operation)
-        call __main
+        # Pass PCB pointer to __libc_main (no operation)
+        call __libc_main

uspace/lib/c/arch/arm32/src/entry.S

@@ -51 +51 @@
         sub fp, ip, #4
 
-        # Pass pcb_ptr to __main as the first argument (in r0)
+        # Pass pcb_ptr to __libc_main as the first argument (in r0)
         mov r0, r1
-        bl __main
+        bl __libc_main
 
 .data

uspace/lib/c/arch/ia32/src/entry.S

@@ -65 +65 @@
         movl %esp, %ebp
 
-        # Pass the PCB pointer to __main as the first argument
+        # Pass the PCB pointer to __libc_main as the first argument
         pushl %edi
-        call __main
+        call __libc_main

uspace/lib/c/arch/ia64/src/entry.S

@@ -41 +41 @@
         movl gp = __gp
 
-        # Pass PCB pointer as the first argument to __main
+        # Pass PCB pointer as the first argument to __libc_main
         mov out0 = r2 ;;
-        br.call.sptk.many b0 = __main
+        br.call.sptk.many b0 = __libc_main
 

uspace/lib/c/arch/mips32/src/entry.S

@@ -51 +51 @@
         .cprestore 16
 
-        # Pass pcb_ptr to __main() as the first argument. It is already
+        # Pass pcb_ptr to __libc_main() as the first argument. It is already
         # in $a0. As the first argument is passed in $a0, no operation
         # is needed.
 
-        jal __main
+        jal __libc_main
         nop
 

uspace/lib/c/arch/ppc32/src/entry.S

@@ -45 +45 @@
         stwu %r1, -16(%r1)
 
-        # Pass the PCB pointer to __main() as the first argument.
+        # Pass the PCB pointer to __libc_main() as the first argument.
         # The first argument is passed in r3.
         mr %r3, %r6
-        bl __main
+        bl __libc_main

uspace/lib/c/arch/riscv64/src/entry.c

@@ -38 +38 @@
 void __entry(void)
 {
-        __main((void *) 0);
+        __libc_main((void *) 0);
 }
 

uspace/lib/c/arch/sparc64/src/entry.S

@@ -46 +46 @@
         add %g0, -0x7ff, %fp
 
-        # Pass pcb_ptr as the first argument to __main()
-        call __main
+        # Pass pcb_ptr as the first argument to __libc_main()
+        call __libc_main
         mov %i1, %o0

uspace/lib/c/generic/libc.c

@@ -67 +67 @@
 static bool env_setup = false;
 
-void __main(void *pcb_ptr)
+void __libc_main(void *pcb_ptr)
 {
         /* Initialize user task run-time environment */

uspace/lib/c/generic/private/libc.h

@@ -37 +37 @@
 
 extern unsigned char _end[];
-extern void __main(void *) __attribute__((noreturn));
+extern void __libc_main(void *) __attribute__((noreturn));
 extern int main(int, char *[]);