diff options
| author |   guenther <guenther@openbsd.org> | 2017-01-19 23:47:04 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2017-01-19 23:47:04 +0000 |
| commit | 48c2532cf0ac165cb15277dedb995ed44e078382 (patch) | |
| tree | 02d6d307aedf2ce0e28adb209502a725307dabc4 /lib/csu | |
| parent | Simplify: bundle stripcom(). (diff) | |
| download | wireguard-openbsd-48c2532cf0ac165cb15277dedb995ed44e078382.tar.xz wireguard-openbsd-48c2532cf0ac165cb15277dedb995ed44e078382.zip | |
MD_START is now always ___start, so expand and eliminate it
ok phessler@ deraadt@
Diffstat (limited to 'lib/csu')
| -rw-r--r-- | lib/csu/alpha/md_init.h | 3 | ||||
| -rw-r--r-- | lib/csu/crt0.c | 7 | ||||
| -rw-r--r-- | lib/csu/sh/md_init.h | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/lib/csu/alpha/md_init.h b/lib/csu/alpha/md_init.h index 19cd9d92397..6089c93043f 100644 --- a/lib/csu/alpha/md_init.h +++ b/lib/csu/alpha/md_init.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md_init.h,v 1.7 2016/08/07 02:34:52 guenther Exp $ */ +/* $OpenBSD: md_init.h,v 1.8 2017/01/19 23:47:04 guenther Exp $ */ /*- * Copyright (c) 2001 Ross Harvey * All rights reserved. @@ -108,7 +108,6 @@ "_dl_printf: \n" \ " ret") -#define MD_START ___start #define MD_START_ARGS char **sp, void (*cleanup)(void) #define MD_START_SETUP \ char **argv, **envp; \ diff --git a/lib/csu/crt0.c b/lib/csu/crt0.c index e6e68da3b0d..3f65c673baa 100644 --- a/lib/csu/crt0.c +++ b/lib/csu/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.8 2016/09/26 15:43:26 kettenis Exp $ */ +/* $OpenBSD: crt0.c,v 1.9 2017/01/19 23:47:04 guenther Exp $ */ /* * Copyright (c) 1995 Christopher G. Demetriou @@ -44,10 +44,7 @@ #define MD_START_ARGS \ int argc, char **argv, char **envp, void (*cleanup)(void) #endif -#ifndef MD_START -#define MD_START ___start static void ___start(MD_START_ARGS) __used; -#endif #ifndef MD_EPROL_LABEL #define MD_EPROL_LABEL __asm(" .text\n_eprol:") #endif @@ -70,7 +67,7 @@ MD_CRT0_START; #endif void -MD_START(MD_START_ARGS) +___start(MD_START_ARGS) { char ***environp; #ifdef MD_START_SETUP diff --git a/lib/csu/sh/md_init.h b/lib/csu/sh/md_init.h index 9286d775579..ea56956b2bb 100644 --- a/lib/csu/sh/md_init.h +++ b/lib/csu/sh/md_init.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md_init.h,v 1.6 2016/03/20 02:32:39 guenther Exp $ */ +/* $OpenBSD: md_init.h,v 1.7 2017/01/19 23:47:04 guenther Exp $ */ /* $NetBSD: dot_init.h,v 1.3 2005/12/24 22:02:10 perry Exp $ */ /*- @@ -144,6 +144,3 @@ __asm(".section " #section "\n" \ " mov #1, r0 \n" \ " .word 0xc380 /* trapa #0x80 */ \n" \ ".previous") - -/* no ASM stub for __start; the C routine can be called directly */ -#define MD_START ___start |