diff options
Diffstat (limited to 'lib/csu/hppa')
| -rw-r--r-- | lib/csu/hppa/Makefile | 10 | ||||
| -rw-r--r-- | lib/csu/hppa/crt0.c | 135 | ||||
| -rw-r--r-- | lib/csu/hppa/md_init.h | 38 |
3 files changed, 42 insertions, 141 deletions
diff --git a/lib/csu/hppa/Makefile b/lib/csu/hppa/Makefile index 110a4b01465..f3dcbbaea5d 100644 --- a/lib/csu/hppa/Makefile +++ b/lib/csu/hppa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2011/11/08 10:37:09 guenther Exp $ +# $OpenBSD: Makefile,v 1.10 2013/12/03 06:21:40 guenther Exp $ # from: @(#)Makefile 5.5 (Berkeley) 5/21/91 OBJS= crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o @@ -11,14 +11,14 @@ CFLAGS+= -I${ELFDIR} -I${.CURDIR} all: ${OBJS} crt0.o: crt0.c - @echo ${COMPILE.c} -DCRT0 -fpie ${.CURDIR}/crt0.c -o ${.TARGET} - @${COMPILE.c} -DCRT0 -fpie ${.CURDIR}/crt0.c -o ${.TARGET}.o + @echo ${COMPILE.c} -DCRT0 -fpie ${ELFDIR}/crt0.c -o ${.TARGET} + @${COMPILE.c} -DCRT0 -fpie ${ELFDIR}/crt0.c -o ${.TARGET}.o @${LD} -x -r -o ${.TARGET} ${.TARGET}.o @rm -f ${.TARGET}.o gcrt0.o: crt0.c - @echo ${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET} - @${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}.o + @echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET} + @${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o @${LD} -x -r -o ${.TARGET} ${.TARGET}.o @rm -f ${.TARGET}.o diff --git a/lib/csu/hppa/crt0.c b/lib/csu/hppa/crt0.c deleted file mode 100644 index 69d2379b6d4..00000000000 --- a/lib/csu/hppa/crt0.c +++ /dev/null @@ -1,135 +0,0 @@ -/* $OpenBSD: crt0.c,v 1.13 2012/12/22 12:14:32 kettenis Exp $ */ - -/* - * Copyright (c) 2001 Michael Shalayeff - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -int global __asm ("$global$") = 0; - -#include <sys/param.h> -#include <sys/syscall.h> -#include <sys/fcntl.h> -#include <sys/exec.h> -#include <stdlib.h> -#include <paths.h> - -typedef char Obj_Entry; - -/* - * Lots of the chunks of this file cobbled together from pieces of - * other OpenBSD crt files, including the common code. - */ - -char **environ; - -extern void __init(void); -extern void __fini(void); - -#ifdef MCRT0 -extern void monstartup(u_long, u_long); -extern void _mcleanup(void); -extern unsigned char etext, eprol; -#endif /* MCRT0 */ - -static char *__strrchr(const char *p, char ch); - -char *__progname = ""; -char __progname_storage[NAME_MAX+1]; - -void ___start(struct ps_strings *arginfo, void (*cleanup)(void)); - -__asm( - ".import $global$, data\n\t" - ".import ___start, code\n\t" - ".text\n\t" - ".align 4\n\t" - ".export _start, entry\n\t" - ".export __start, entry\n\t" - ".type _start,@function\n\t" - ".type __start,@function\n\t" - ".label _start\n\t" - ".label __start\n\t" - ".proc\n\t" - ".callinfo frame=0, calls\n\t" - ".entry\n\t" - "bl L$lpc, %r27\n\t" - "depi 0, 31, 2, %r27\n\t" -"L$lpc: addil L'$global$ - ($PIC_pcrel$0 - 8), %r27\n\t" - "ldo R'$global$ - ($PIC_pcrel$0 - 12)(%r1),%r27\n\t" - ".call\n\t" - "b ___start\n\t" - "copy %r27, %r19\n\t" - ".exit\n\t" - ".procend\n\t"); - -void -___start(struct ps_strings *arginfo, void (*cleanup)(void)) -{ - char **argv, *namep; - char *s; - - argv = arginfo->ps_argvstr; - environ = arginfo->ps_envstr; - if ((namep = argv[0]) != NULL) { /* NULL ptr if argc = 0 */ - if ((__progname = __strrchr(namep, '/')) == NULL) - __progname = namep; - else - __progname++; - for (s = __progname_storage; *__progname && - s < &__progname_storage[sizeof __progname_storage - 1]; ) - *s++ = *__progname++; - *s = '\0'; - __progname = __progname_storage; - } - - if (cleanup) - atexit(cleanup); - -#ifdef MCRT0 - atexit(_mcleanup); - monstartup((u_long)&eprol, (u_long)&etext); -#endif - - __init(); - - exit(main(arginfo->ps_nargvstr, argv, environ)); -} - -static char * -__strrchr(const char *p, char ch) -{ - char *save; - - for (save = NULL;; ++p) { - if (*p == ch) - save = (char *)p; - if (!*p) - return(save); - } -} - -#ifdef MCRT0 -__asm (".export eprol, entry\n\t.label eprol"); -#endif diff --git a/lib/csu/hppa/md_init.h b/lib/csu/hppa/md_init.h index 732605ed263..ddd9e8769d2 100644 --- a/lib/csu/hppa/md_init.h +++ b/lib/csu/hppa/md_init.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md_init.h,v 1.3 2012/08/22 17:19:34 pascal Exp $ */ +/* $OpenBSD: md_init.h,v 1.4 2013/12/03 06:21:40 guenther Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -66,3 +66,39 @@ " bv %r0(%r2) \n" \ " ldo -64(%r30),%r30 \n" \ " .previous") + + +#include <sys/exec.h> /* for struct psstrings */ + +#define MD_CRT0_START \ + __asm( \ + ".import $global$, data \n" \ + " .import ___start, code \n" \ + " .text \n" \ + " .align 4 \n" \ + " .export __start, entry \n" \ + " .type __start,@function \n" \ + " .label __start \n" \ + " .proc \n" \ + " .callinfo frame=0, calls \n" \ + " .entry \n" \ + " bl L$lpc, %r27 \n" \ + " depi 0, 31, 2, %r27 \n" \ + "L$lpc: addil L'$global$ - ($PIC_pcrel$0 - 8), %r27 \n" \ + " ldo R'$global$ - ($PIC_pcrel$0 - 12)(%r1),%r27 \n" \ + " .call \n" \ + " b ___start \n" \ + " copy %r27, %r19 \n" \ + " .exit \n" \ + " .procend") + +#define MD_START_ARGS struct ps_strings *arginfo, void (*cleanup)(void) +#define MD_START_SETUP \ + char **argv, **envp; \ + int argc; \ + \ + argv = arginfo->ps_argvstr; \ + argc = arginfo->ps_nargvstr; \ + environ = envp = arginfo->ps_envstr; + +#define MD_EPROL_LABEL __asm (".export _eprol, entry\n\t.label _eprol") |