Revert "crt1: Move main declaration to mes/lib-mini.h."
This reverts commit 5b55627e0ccf7c798284a380a20a2eb4d6b9c4c0.
This commit is contained in:
parent
ad6c02076f
commit
4a0bb97d70
|
@ -52,8 +52,6 @@ extern int __stdout;
|
||||||
extern int __stderr;
|
extern int __stderr;
|
||||||
|
|
||||||
void __init_io ();
|
void __init_io ();
|
||||||
int main (int argc, char *argv[], char *envp[]);
|
|
||||||
|
|
||||||
int eputs (char const *s);
|
int eputs (char const *s);
|
||||||
int puts (char const *s);
|
int puts (char const *s);
|
||||||
int oputs (char const *s);
|
int oputs (char const *s);
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <mes/lib-mini.h>
|
#include <mes/lib-mini.h>
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
// *INDENT-OFF*
|
// *INDENT-OFF*
|
||||||
void
|
void
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "mes/lib-mini.h"
|
#include "mes/lib-mini.h"
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
int
|
int
|
||||||
_start ()
|
_start ()
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
* along with Mes. If not, see <http://www.gnu.org/licenses/>.
|
* along with Mes. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <mes/lib-mini.h>
|
|
||||||
#include <gnu/hurd.h>
|
#include <gnu/hurd.h>
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
char **environ;
|
char **environ;
|
||||||
int __stdin;
|
int __stdin;
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <mes/lib-mini.h>
|
#include <mes/lib-mini.h>
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
/* Note: GCC automatically emits a preable in order to set up the
|
/* Note: GCC automatically emits a preable in order to set up the
|
||||||
frame pointer: "push {fp}" "add fp, sp, 0"
|
frame pointer: "push {fp}" "add fp, sp, 0"
|
||||||
|
|
|
@ -24,6 +24,7 @@ int __stdin;
|
||||||
int __stdout;
|
int __stdout;
|
||||||
int __stderr;
|
int __stderr;
|
||||||
char **environ;
|
char **environ;
|
||||||
|
int main (int argc, char **argv, char **envp);
|
||||||
|
|
||||||
/* FIXME: this is going to be called `FUNCTION__start' */
|
/* FIXME: this is going to be called `FUNCTION__start' */
|
||||||
//#int
|
//#int
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "mes/lib-mini.h"
|
#include "mes/lib-mini.h"
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
void /* must not return */
|
void /* must not return */
|
||||||
_start ()
|
_start ()
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <mes/lib-mini.h>
|
#include <mes/lib-mini.h>
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
/* gcc will generate the following preamble:
|
/* gcc will generate the following preamble:
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ int __stdin;
|
||||||
int __stdout;
|
int __stdout;
|
||||||
int __stderr;
|
int __stderr;
|
||||||
char **environ;
|
char **environ;
|
||||||
|
int main (int argc, char **argv, char **envp);
|
||||||
|
|
||||||
/* FIXME: this is going to be called `FUNCTION__start' */
|
/* FIXME: this is going to be called `FUNCTION__start' */
|
||||||
//#int
|
//#int
|
||||||
|
|
|
@ -21,9 +21,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "mes/lib-mini.h"
|
#include "mes/lib-mini.h"
|
||||||
int main (int argc, char *argv[], char *envp[]);
|
|
||||||
#include "linux/riscv64/syscall.h"
|
#include "linux/riscv64/syscall.h"
|
||||||
|
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
/* mesc will generate the following preamble:
|
/* mesc will generate the following preamble:
|
||||||
|
|
||||||
push ra
|
push ra
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <mes/lib-mini.h>
|
#include <mes/lib-mini.h>
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
// *INDENT-OFF*
|
// *INDENT-OFF*
|
||||||
void
|
void
|
||||||
|
|
|
@ -24,6 +24,7 @@ int __stdin;
|
||||||
int __stdout;
|
int __stdout;
|
||||||
int __stderr;
|
int __stderr;
|
||||||
char **environ;
|
char **environ;
|
||||||
|
int main (int argc, char **argv, char **envp);
|
||||||
|
|
||||||
/* FIXME: this is going to be called `FUNCTION__start' */
|
/* FIXME: this is going to be called `FUNCTION__start' */
|
||||||
//#int
|
//#int
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "mes/lib-mini.h"
|
#include "mes/lib-mini.h"
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
int
|
int
|
||||||
_start ()
|
_start ()
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
// let's try _main first
|
// let's try _main first
|
||||||
|
|
||||||
#include <mes/lib-mini.h>
|
#include <mes/lib-mini.h>
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
// gcc x86_64 calling convention:
|
// gcc x86_64 calling convention:
|
||||||
// rdi, rsi, rdx, rcx, r8, r9, <stack0>, <stack1>
|
// rdi, rsi, rdx, rcx, r8, r9, <stack0>, <stack1>
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <mes/lib-mini.h>
|
#include <mes/lib-mini.h>
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
// gcc x86_64 calling convention:
|
// gcc x86_64 calling convention:
|
||||||
// rdi, rsi, rdx, rcx, r8, r9, <stack0>, <stack1>
|
// rdi, rsi, rdx, rcx, r8, r9, <stack0>, <stack1>
|
||||||
|
|
|
@ -24,6 +24,7 @@ int __stdin;
|
||||||
int __stdout;
|
int __stdout;
|
||||||
int __stderr;
|
int __stderr;
|
||||||
char **environ;
|
char **environ;
|
||||||
|
int main (int argc, char **argv, char **envp);
|
||||||
|
|
||||||
/* FIXME: this is going to be called `FUNCTION__start' */
|
/* FIXME: this is going to be called `FUNCTION__start' */
|
||||||
//#int
|
//#int
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "mes/lib-mini.h"
|
#include "mes/lib-mini.h"
|
||||||
|
int main (int argc, char *argv[], char *envp[]);
|
||||||
|
|
||||||
int
|
int
|
||||||
_start ()
|
_start ()
|
||||||
|
|
Loading…
Reference in a new issue