Mirrors
/
netbsd-src
mirror of https://github.com/NetBSD/src.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Good bye oabi! Tested building earmv7hf.

thorpej-cfargs2
christos 2021-06-07 17:11:16 +00:00
parent 0000e1fe68
commit 9f4fca625f
11 changed files with 61 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sh
View File

@ -1,5 +1,5 @@
#! /usr/bin/env sh
# $NetBSD: build.sh,v 1.352 2021/05/27 21:03:26 christos Exp $
# $NetBSD: build.sh,v 1.353 2021/06/07 17:11:16 christos Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@ -616,7 +616,6 @@ level of source directory"
# and with a blank MACHINE_ARCH.
#
valid_MACHINE_ARCH='
MACHINE=acorn32 MACHINE_ARCH=arm
MACHINE=acorn32 MACHINE_ARCH=earmv4 ALIAS=eacorn32 DEFAULT
MACHINE=algor MACHINE_ARCH=mips64el ALIAS=algor64
MACHINE=algor MACHINE_ARCH=mipsel DEFAULT
@ -628,14 +627,12 @@ MACHINE=arc MACHINE_ARCH=mips64el ALIAS=arc64
MACHINE=arc MACHINE_ARCH=mipsel DEFAULT
MACHINE=atari MACHINE_ARCH=m68k
MACHINE=bebox MACHINE_ARCH=powerpc
MACHINE=cats MACHINE_ARCH=arm ALIAS=ocats
MACHINE=cats MACHINE_ARCH=earmv4 ALIAS=ecats DEFAULT
MACHINE=cesfic MACHINE_ARCH=m68k
MACHINE=cobalt MACHINE_ARCH=mips64el ALIAS=cobalt64
MACHINE=cobalt MACHINE_ARCH=mipsel DEFAULT
MACHINE=dreamcast MACHINE_ARCH=sh3el
MACHINE=emips MACHINE_ARCH=mipseb
MACHINE=epoc32 MACHINE_ARCH=arm
MACHINE=epoc32 MACHINE_ARCH=earmv4 ALIAS=eepoc32 DEFAULT
MACHINE=evbarm MACHINE_ARCH= NO_DEFAULT
MACHINE=evbarm MACHINE_ARCH=earmv4 ALIAS=evbearmv4-el ALIAS=evbarmv4-el
@ -670,14 +667,12 @@ MACHINE=evbsh3 MACHINE_ARCH=sh3el ALIAS=evbsh3-el
MACHINE=ews4800mips MACHINE_ARCH=mipseb
MACHINE=hp300 MACHINE_ARCH=m68k
MACHINE=hppa MACHINE_ARCH=hppa
MACHINE=hpcarm MACHINE_ARCH=arm ALIAS=hpcoarm
MACHINE=hpcarm MACHINE_ARCH=earmv4 ALIAS=hpcearm DEFAULT
MACHINE=hpcmips MACHINE_ARCH=mipsel
MACHINE=hpcsh MACHINE_ARCH=sh3el
MACHINE=i386 MACHINE_ARCH=i386
MACHINE=ia64 MACHINE_ARCH=ia64
MACHINE=ibmnws MACHINE_ARCH=powerpc
MACHINE=iyonix MACHINE_ARCH=arm ALIAS=oiyonix
MACHINE=iyonix MACHINE_ARCH=earm ALIAS=eiyonix DEFAULT
MACHINE=landisk MACHINE_ARCH=sh3el
MACHINE=luna68k MACHINE_ARCH=m68k
@ -688,7 +683,6 @@ MACHINE=mipsco MACHINE_ARCH=mipseb
MACHINE=mmeye MACHINE_ARCH=sh3eb
MACHINE=mvme68k MACHINE_ARCH=m68k
MACHINE=mvmeppc MACHINE_ARCH=powerpc
MACHINE=netwinder MACHINE_ARCH=arm ALIAS=onetwinder
MACHINE=netwinder MACHINE_ARCH=earmv4 ALIAS=enetwinder DEFAULT
MACHINE=news68k MACHINE_ARCH=m68k
MACHINE=newsmips MACHINE_ARCH=mipseb
@ -711,7 +705,6 @@ MACHINE=sbmips MACHINE_ARCH=mipseb ALIAS=sbmips-eb
MACHINE=sbmips MACHINE_ARCH=mipsel ALIAS=sbmips-el
MACHINE=sgimips MACHINE_ARCH=mips64eb ALIAS=sgimips64
MACHINE=sgimips MACHINE_ARCH=mipseb DEFAULT
MACHINE=shark MACHINE_ARCH=arm ALIAS=oshark
MACHINE=shark MACHINE_ARCH=earmv4 ALIAS=eshark DEFAULT
MACHINE=sparc MACHINE_ARCH=sparc
MACHINE=sparc64 MACHINE_ARCH=sparc64
@ -719,7 +712,6 @@ MACHINE=sun2 MACHINE_ARCH=m68000
MACHINE=sun3 MACHINE_ARCH=m68k
MACHINE=vax MACHINE_ARCH=vax
MACHINE=x68k MACHINE_ARCH=m68k
MACHINE=zaurus MACHINE_ARCH=arm ALIAS=ozaurus
MACHINE=zaurus MACHINE_ARCH=earm ALIAS=ezaurus DEFAULT
'
@ -1973,7 +1965,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
# Generated from: \$NetBSD: build.sh,v 1.352 2021/05/27 21:03:26 christos Exp $
# Generated from: \$NetBSD: build.sh,v 1.353 2021/06/07 17:11:16 christos Exp $
# with these arguments: ${_args}
#

7
compat/archdirs.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: archdirs.mk,v 1.13 2021/04/25 15:18:23 christos Exp $
# $NetBSD: archdirs.mk,v 1.14 2021/06/07 17:11:16 christos Exp $
# list of subdirs used per-platform
@ -10,10 +10,6 @@ ARCHDIR_SUBDIR+= sparc64/sparc
ARCHDIR_SUBDIR+= amd64/i386
.endif
.if !empty(MACHINE_ARCH:Mearm*)
ARCHDIR_SUBDIR+= arm/oabi
.endif
.if !empty(MACHINE_ARCH:Mmips64*)
ARCHDIR_SUBDIR+= mips64/64
ARCHDIR_SUBDIR+= mips64/o32
@ -36,7 +32,6 @@ ARCHDIR_SUBDIR+= riscv64/rv32
.if (${MACHINE_ARCH} == "aarch64")
ARCHDIR_SUBDIR+= arm/eabi
ARCHDIR_SUBDIR+= arm/eabihf
ARCHDIR_SUBDIR+= arm/oabi
.elif (${MACHINE_ARCH} == "aarch64eb")
ARCHDIR_SUBDIR+= arm/eabi
.endif

28
distrib/sets/lists/base/ad.aarch64
View File

@ -1,13 +1,13 @@
# $NetBSD: ad.aarch64,v 1.35 2020/09/12 15:25:41 jmcneill Exp $
# $NetBSD: ad.aarch64,v 1.36 2021/06/07 17:11:16 christos Exp $
./lib/eabi base-compat-lib compat,llvm
./lib/eabi/npf base-compat-lib compat,llvm
./lib/eabihf base-compat-lib compat,llvm
./lib/eabihf/npf base-compat-lib compat,llvm
./lib/oabi base-compat-lib compat,llvm
./lib/oabi/npf base-compat-lib compat,llvm
./lib/oabi base-obsolete obsolete
./lib/oabi/npf base-obsolete obsolete
./libexec/ld.elf_so-eabi base-compat-shlib compat,pic,llvm
./libexec/ld.elf_so-eabihf base-compat-shlib compat,pic,llvm
./libexec/ld.elf_so-oabi base-sysutil-bin compat,pic,llvm
./libexec/ld.elf_so-oabi base-obsolete obsolete
./usr/lib/eabi base-compat-lib compat,llvm
./usr/lib/eabi/i18n base-compat-lib compat,llvm
./usr/lib/eabi/libarm.so.0 base-compat-shlib compat,pic,llvm
@ -24,18 +24,18 @@
./usr/lib/eabihf/lua base-compat-lib compat,llvm
./usr/lib/eabihf/lua/5.3 base-compat-lib compat,llvm
./usr/lib/eabihf/security base-compat-lib compat,llvm
./usr/lib/oabi base-compat-lib compat,llvm
./usr/lib/oabi/i18n base-compat-lib compat,llvm
./usr/lib/oabi/libarm.so.0 base-compat-shlib compat,pic,llvm
./usr/lib/oabi/libarm.so.0.0 base-compat-shlib compat,pic,llvm
./usr/lib/oabi/libc_vfp.so.0 base-compat-shlib compat,pic,llvm
./usr/lib/oabi/libc_vfp.so.0.0 base-compat-shlib compat,pic,llvm
./usr/lib/oabi/lua base-compat-lib compat,llvm
./usr/lib/oabi/lua/5.3 base-compat-lib compat,llvm
./usr/lib/oabi/security base-compat-lib compat,llvm
./usr/lib/oabi base-obsolete obsolete
./usr/lib/oabi/i18n base-obsolete obsolete
./usr/lib/oabi/libarm.so.0 base-obsolete obsolete
./usr/lib/oabi/libarm.so.0.0 base-obsolete obsolete
./usr/lib/oabi/libc_vfp.so.0 base-obsolete obsolete
./usr/lib/oabi/libc_vfp.so.0.0 base-obsolete obsolete
./usr/lib/oabi/lua base-obsolete obsolete
./usr/lib/oabi/lua/5.3 base-obsolete obsolete
./usr/lib/oabi/security base-obsolete obsolete
./usr/libexec/ld.elf_so-eabi base-compat-shlib compat,pic,llvm
./usr/libexec/ld.elf_so-eabihf base-compat-shlib compat,pic,llvm
./usr/libexec/ld.elf_so-oabi base-sysutil-bin compat,pic,llvm
./usr/libexec/ld.elf_so-oabi base-obsolete obsolete
./usr/mdec/bootaa64.efi base-sysutil-bin uefi
./usr/sbin/ofctl base-sysutil-bin
./usr/sbin/tpctl base-sysutil-bin

10
distrib/sets/lists/base/ad.arm
View File

@ -1,5 +1,5 @@
# $NetBSD: ad.arm,v 1.85 2020/09/12 15:25:41 jmcneill Exp $
./libexec/ld.elf_so-oabi base-sysutil-bin compat,pic
# $NetBSD: ad.arm,v 1.86 2021/06/07 17:11:16 christos Exp $
./libexec/ld.elf_so-oabi base-obsolete obsolete
./sbin/ldconfig base-sysutil-root pic,endian=1234
./usr/bin/fdformat base-util-bin
./usr/lib/libarm.so base-sys-shlib pic,compatfile
@ -8,9 +8,9 @@
./usr/lib/libpmc.so base-obsolete obsolete
./usr/lib/libpmc.so.1 base-obsolete obsolete
./usr/lib/libpmc.so.1.0 base-obsolete obsolete
./usr/lib/oabi/libc_vfp.so.0 base-compat-shlib compat,pic
./usr/lib/oabi/libc_vfp.so.0.0 base-compat-shlib compat,pic
./usr/libexec/ld.elf_so-oabi base-sysutil-bin compat,pic
./usr/lib/oabi/libc_vfp.so.0 base-obsolete obsolete
./usr/lib/oabi/libc_vfp.so.0.0 base-obsolete obsolete
./usr/libexec/ld.elf_so-oabi base-obsolete obsolete
./usr/libexec/ld.so base-sys-shlib pic,endian=1234
./usr/mdec/BBBB base-obsolete obsolete
./usr/mdec/boot26 base-obsolete obsolete

18
distrib/sets/lists/comp/ad.aarch64
View File

@ -1,4 +1,4 @@
# $NetBSD: ad.aarch64,v 1.46 2021/05/30 01:56:45 joerg Exp $
# $NetBSD: ad.aarch64,v 1.47 2021/06/07 17:11:17 christos Exp $
./usr/include/aarch64 comp-c-include
./usr/include/aarch64/ansi.h comp-c-include
./usr/include/aarch64/aout_machdep.h comp-c-include
@ -176,14 +176,14 @@
./usr/lib/eabihf/libarm.so base-sys-shlib compat,pic,llvm
./usr/lib/eabihf/libarm_p.a comp-c-proflib compat,profile,llvm
./usr/lib/eabihf/libarm_pic.a comp-c-piclib compat,pic,picinstall,llvm
./usr/lib/oabi/libarm.a comp-c-lib compat,llvm
./usr/lib/oabi/libarm.so base-sys-shlib compat,pic,llvm
./usr/lib/oabi/libarm_p.a comp-c-proflib compat,profile,llvm
./usr/lib/oabi/libarm_pic.a comp-c-piclib compat,pic,picinstall,llvm
./usr/lib/oabi/libc_vfp.a comp-c-lib compat,llvm
./usr/lib/oabi/libc_vfp.so base-sys-shlib compat,pic,llvm
./usr/lib/oabi/libc_vfp_p.a comp-c-proflib compat,profile,llvm
./usr/lib/oabi/libc_vfp_pic.a comp-c-piclib compat,pic,picinstall,llvm
./usr/lib/oabi/libarm.a comp-obsolete obsolete
./usr/lib/oabi/libarm.so base-obsolete obsolete
./usr/lib/oabi/libarm_p.a comp-obsolete obsolete
./usr/lib/oabi/libarm_pic.a comp-obsolete obsolete
./usr/lib/oabi/libc_vfp.a comp-obsolete obsolete
./usr/lib/oabi/libc_vfp.so base-obsolete obsolete
./usr/lib/oabi/libc_vfp_p.a comp-obsolete obsolete
./usr/lib/oabi/libc_vfp_pic.a comp-obsolete obsolete
./usr/libdata/ldscripts/aarch64elf.x comp-util-bin binutils
./usr/libdata/ldscripts/aarch64elf.xbn comp-util-bin binutils
./usr/libdata/ldscripts/aarch64elf.xc comp-util-bin binutils

8
distrib/sets/lists/comp/ad.arm
View File

@ -1,4 +1,4 @@
# $NetBSD: ad.arm,v 1.106 2021/05/30 01:56:45 joerg Exp $
# $NetBSD: ad.arm,v 1.107 2021/06/07 17:11:17 christos Exp $
./usr/bin/elf2aout comp-sysutil-bin
./usr/include/acorn26 comp-obsolete obsolete
./usr/include/acorn26/ansi.h comp-obsolete obsolete
@ -717,9 +717,9 @@
./usr/lib/libc_vfp_p.a comp-c-lib profile,softfloat
./usr/lib/libpmc.a comp-obsolete obsolete
./usr/lib/libpmc_p.a comp-obsolete obsolete
./usr/lib/oabi/libc_vfp.a comp-c-lib compat
./usr/lib/oabi/libc_vfp.so base-sys-shlib compat,pic
./usr/lib/oabi/libc_vfp_p.a comp-c-proflib compat,profile
./usr/lib/oabi/libc_vfp.a comp-obsolete obsolete
./usr/lib/oabi/libc_vfp.so base-obsolete obsolete
./usr/lib/oabi/libc_vfp_p.a comp-obsolete obsolete
./usr/libdata/ldscripts/armelf.x comp-util-bin binutils
./usr/libdata/ldscripts/armelf.xbn comp-util-bin binutils
./usr/libdata/ldscripts/armelf.xc comp-util-bin binutils

4
distrib/sets/lists/comp/ad.arm.shl
View File

@ -1,6 +1,6 @@
# $NetBSD: ad.arm.shl,v 1.8 2018/07/12 06:52:49 maxv Exp $
# $NetBSD: ad.arm.shl,v 1.9 2021/06/07 17:11:17 christos Exp $
./usr/lib/libarm32_pic.a comp-obsolete obsolete
./usr/lib/libarm_pic.a comp-c-piclib picinstall,compatfile
./usr/lib/libc_vfp_pic.a comp-c-piclib softfloat,picinstall
./usr/lib/libpmc_pic.a comp-obsolete obsolete
./usr/lib/oabi/libc_vfp_pic.a comp-c-piclib picinstall,compat
./usr/lib/oabi/libc_vfp_pic.a comp-obsolete obsolete

26
distrib/sets/lists/debug/ad.aarch64
View File

@ -1,18 +1,18 @@
# $NetBSD: ad.aarch64,v 1.32 2020/09/12 15:25:42 jmcneill Exp $
# $NetBSD: ad.aarch64,v 1.33 2021/06/07 17:11:17 christos Exp $
./usr/lib/eabi/libarm_g.a comp-sys-debug debuglib,compat,llvm
./usr/lib/eabi/libc_vfp_g.a comp-sys-debug debuglib,compat,llvm
./usr/lib/eabihf/libarm_g.a comp-sys-debug debuglib,compat,llvm
./usr/lib/oabi/libarm_g.a comp-sys-debug debuglib,compat,llvm
./usr/lib/oabi/libc_vfp_g.a comp-sys-debug debuglib,compat,llvm
./usr/lib/oabi/libarm_g.a comp-obsolete obsolete
./usr/lib/oabi/libc_vfp_g.a comp-obsolete obsolete
./usr/libdata/debug/lib/eabi comp-sys-debug compat,llvm
./usr/libdata/debug/lib/eabi/npf comp-sys-debug compat,llvm
./usr/libdata/debug/lib/eabihf comp-sys-debug compat,llvm
./usr/libdata/debug/lib/eabihf/npf comp-sys-debug compat,llvm
./usr/libdata/debug/lib/oabi comp-sys-debug compat,llvm
./usr/libdata/debug/lib/oabi/npf comp-sys-debug compat,llvm
./usr/libdata/debug/lib/oabi comp-obsolete obsolete
./usr/libdata/debug/lib/oabi/npf comp-obsolete obsolete
./usr/libdata/debug/libexec/ld.elf_so-eabi.debug comp-sys-debug debug,compat,llvm
./usr/libdata/debug/libexec/ld.elf_so-eabihf.debug comp-sys-debug debug,compat,llvm
./usr/libdata/debug/libexec/ld.elf_so-oabi.debug comp-sys-debug debug,compat,llvm
./usr/libdata/debug/libexec/ld.elf_so-oabi.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/eabi comp-sys-debug compat,llvm
./usr/libdata/debug/usr/lib/eabi/i18n comp-sys-debug compat,llvm
./usr/libdata/debug/usr/lib/eabi/libarm.so.0.0.debug comp-sys-debug debug,compat,pic,llvm
@ -24,14 +24,14 @@
./usr/libdata/debug/usr/lib/eabihf/libarm.so.0.0.debug comp-sys-debug debug,compat,pic,llvm
./usr/libdata/debug/usr/lib/eabihf/libproc.so.1.0.debug comp-sys-debug debug,compat,pic,llvm,dtrace
./usr/libdata/debug/usr/lib/eabihf/librtld_db.so.0.0.debug comp-sys-debug debug,compat,pic,llvm,dtrace
./usr/libdata/debug/usr/lib/oabi comp-sys-debug compat,llvm
./usr/libdata/debug/usr/lib/oabi/i18n comp-sys-debug compat,llvm
./usr/libdata/debug/usr/lib/oabi/libarm.so.0.0.debug comp-sys-debug debug,compat,pic,llvm
./usr/libdata/debug/usr/lib/oabi/libc_vfp.so.0.0.debug comp-sys-debug debug,compat,pic,llvm
./usr/libdata/debug/usr/lib/oabi/libproc.so.1.0.debug comp-sys-debug debug,compat,pic,llvm,dtrace
./usr/libdata/debug/usr/lib/oabi/librtld_db.so.0.0.debug comp-sys-debug debug,compat,pic,llvm,dtrace
./usr/libdata/debug/usr/lib/oabi comp-obsolete obsolete
./usr/libdata/debug/usr/lib/oabi/i18n comp-obsolete obsolete
./usr/libdata/debug/usr/lib/oabi/libarm.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/oabi/libc_vfp.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/oabi/libproc.so.1.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/oabi/librtld_db.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/libexec/ld.elf_so-eabi.debug comp-sys-debug debug,compat,llvm
./usr/libdata/debug/usr/libexec/ld.elf_so-eabihf.debug comp-sys-debug debug,compat,llvm
./usr/libdata/debug/usr/libexec/ld.elf_so-oabi.debug comp-sys-debug debug,compat,llvm
./usr/libdata/debug/usr/libexec/ld.elf_so-oabi.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/ofctl.debug comp-util-debug debug
./usr/libdata/debug/usr/sbin/tpctl.debug comp-sysutil-debug debug

14
distrib/sets/lists/debug/ad.arm
View File

@ -1,24 +1,24 @@
# $NetBSD: ad.arm,v 1.77 2018/12/31 13:54:52 christos Exp $
# $NetBSD: ad.arm,v 1.78 2021/06/07 17:11:17 christos Exp $
./usr/lib/libarm_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libc_vfp_g.a comp-c-debuglib debuglib,softfloat
./usr/lib/libpmc_g.a comp-obsolete obsolete
./usr/lib/oabi/libc_vfp_g.a comp-c-debuglib debuglib,compat
./usr/lib/oabi/libc_vfp_g.a comp-obsolete obsolete
./usr/lib/oabi/libgmp_g.a comp-obsolete obsolete
./usr/lib/oabi/libmpc_g.a comp-obsolete obsolete
./usr/lib/oabi/libmpfr_g.a comp-obsolete obsolete
./usr/libdata/debug/lib/libc_vfp.so.0.0.debug comp-sys-debug debug,pic,softfloat
./usr/libdata/debug/libexec/ld.elf_so-oabi.debug comp-sys-debug debug,compat
./usr/libdata/debug/libexec/ld.elf_so-oabi.debug comp-obsolete obsolete
./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic,endian=1234
./usr/libdata/debug/usr/bin/elf2aout.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug
./usr/libdata/debug/usr/lib/libarm.so.0.0.debug comp-sys-debug debug,pic,compatfile
./usr/libdata/debug/usr/lib/libc_vfp.so.0.0.debug comp-sys-debug debug,pic,softfloat
./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/oabi/libc_vfp.so.0.0.debug comp-sys-debug debug,compat,pic
./usr/libdata/debug/usr/lib/oabi/libproc.so.1.0.debug comp-sys-debug debug,compat,dtrace
./usr/libdata/debug/usr/lib/oabi/librtld_db.so.0.0.debug comp-sys-debug debug,compat,dtrace
./usr/libdata/debug/usr/lib/oabi/libc_vfp.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/oabi/libproc.so.1.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/oabi/librtld_db.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/libexec/ld.elf_so-oabi comp-obsolete obsolete
./usr/libdata/debug/usr/libexec/ld.elf_so-oabi.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/libexec/ld.elf_so-oabi.debug comp-obsolete obsolete
./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/apmd.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/eeprom.debug comp-util-debug debug

4
tests/lib/csu/h_ifunc_static.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: h_ifunc_static.c,v 1.3 2021/06/03 20:17:37 christos Exp $ */
/* $NetBSD: h_ifunc_static.c,v 1.4 2021/06/07 17:11:17 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#if (defined(__arm__) && defined(__ARM_EABI__)) || defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__sparc__)
#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__sparc__)
#include <stdlib.h>
#include <string.h>

4
tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c
View File

@ -31,9 +31,9 @@
#include <string.h>
/*
* Not supported on hppa or on arm with oabi
* Not supported on hppa
*/
#if !defined(__hppa__) && !(defined(__arm__) && !defined(__ARM_EABI__))
#if !defined(__hppa__)
static long long
ifunc1(void)