diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-02-26 22:26:43 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2017-02-26 22:26:43 +0000 |
| commit | a7210c202c0b9b6e8955555be6bb64d9d16b9baf (patch) | |
| tree | 24633457829dfd1ad1c72d91cc756abeb212dab4 /lib | |
| parent | 718cfc6500d2c050df1f7dc0e77b5d25f6c21330 (diff) | |
Our certbegin/certend is always PIC, so remove the non-PIC MD_SECT_CALL_FUNC()
implementations.
ok guenther@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/csu/aarch64/md_init.h | 15 | ||||
| -rw-r--r-- | lib/csu/hppa/md_init.h | 17 |
2 files changed, 2 insertions, 30 deletions
diff --git a/lib/csu/aarch64/md_init.h b/lib/csu/aarch64/md_init.h index 3c7e7b004e4..1be074a1860 100644 --- a/lib/csu/aarch64/md_init.h +++ b/lib/csu/aarch64/md_init.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md_init.h,v 1.2 2017/01/24 01:43:32 kettenis Exp $ */ +/* $OpenBSD: md_init.h,v 1.3 2017/02/26 22:26:42 kettenis Exp $ */ /*- * Copyright (c) 2001 Ross Harvey @@ -33,23 +33,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef __PIC__ - /* This nastyness derived from gcc3 output */ #define MD_SECT_CALL_FUNC(section, func) \ __asm (".section "#section", \"ax\" \n" \ " bl " #func " \n" \ " .previous") -#else -#define MD_SECT_CALL_FUNC(section, func) \ - __asm (".section "#section", \"ax\" \n" \ - " adr x0, 1f \n" \ - " ldr x0, [x0] \n" \ - " adr lr, 2f \n" \ - " br x0 \n" \ - "1: .xword " #func " \n" \ - "2: \n" \ - " .previous") -#endif #define MD_SECTION_PROLOGUE(sect, entry_pt) \ __asm ( \ diff --git a/lib/csu/hppa/md_init.h b/lib/csu/hppa/md_init.h index 93406b467c5..f6b8366290e 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.11 2017/01/21 01:43:16 guenther Exp $ */ +/* $OpenBSD: md_init.h,v 1.12 2017/02/26 22:26:42 kettenis Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -46,27 +46,12 @@ " .int "#value" \n" \ " .previous") -#ifdef __PIC__ #define MD_SECT_CALL_FUNC(section, func) \ __asm (".section "#section",\"ax\",@progbits \n" \ " bl " #func ",%r2 \n" \ " stw %r19,-80(%r30) \n" \ " ldw -80(%r30),%r19 \n" \ " .previous") -#else -#define MD_SECT_CALL_FUNC(section, func) \ - __asm (".section .rodata \n" \ - " .align 4 \n" \ - "L$" #func " \n" \ - " .word "#func " \n" \ - " .previous \n" \ - " .section "#section",\"ax\",@progbits \n" \ - " ldil LR'L$" #func ",%r1 \n" \ - " ldw RR'L$" #func "(%r1), %r31 \n" \ - " ble 0(%sr4,%r31) \n" \ - " copy %r31,%r2 \n" \ - " .previous") -#endif #define MD_SECTION_PROLOGUE(sect, entry_pt) \ __asm ( \ |