Module Name: src
Committed By: snj
Date: Mon Jun 1 19:38:35 UTC 2015
Modified Files:
src/compat [netbsd-7]: archdirs.mk
src/compat/arm/eabihf [netbsd-7]: bsd.eabihf.mk
src/external/gpl3/gcc/dist/gcc [netbsd-7]: config.gcc
src/external/gpl3/gcc/dist/gcc/config/arm [netbsd-7]: netbsd-eabi.h
Added Files:
src/external/gpl3/gcc/dist/gcc/config/arm [netbsd-7]: t-netbsdeabi
Log Message:
Pull up following revision(s) (requested by martin in ticket #816):
compat/archdirs.mk: revisions 1.7, 1.9, 1.10
compat/arm/eabihf/bsd.eabihf.mk: revision 1.2
external/gpl3/gcc/dist/gcc/config.gcc: revision 1.33
external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h: revision 1.14
external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi: revision 1.1
Enable building eabihf compat libraries after fixing bsd.eabihf.mk to use
--
use the proper variant of arm*--netbsdelf-eabihf
--
Fix broken subdir selection after arm architecture explosion
--
Only support oabi for earm*
--
Make MULTILIBS work for oabi
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 src/compat/archdirs.mk
cvs rdiff -u -r1.1 -r1.1.2.1 src/compat/arm/eabihf/bsd.eabihf.mk
cvs rdiff -u -r1.26.2.2 -r1.26.2.3 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.13 -r1.13.2.1 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
cvs rdiff -u -r0 -r1.1.2.2 \
src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.6 src/compat/archdirs.mk:1.6.2.1
--- src/compat/archdirs.mk:1.6 Mon Aug 11 04:33:30 2014
+++ src/compat/archdirs.mk Mon Jun 1 19:38:35 2015
@@ -1,4 +1,4 @@
-# $NetBSD: archdirs.mk,v 1.6 2014/08/11 04:33:30 matt Exp $
+# $NetBSD: archdirs.mk,v 1.6.2.1 2015/06/01 19:38:35 snj Exp $
# list of subdirs used per-platform
@@ -10,18 +10,10 @@ ARCHDIR_SUBDIR= sparc64/sparc
ARCHDIR_SUBDIR= amd64/i386
.endif
-.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "armeb")
-ARCHDIR_SUBDIR= arm/eabi
-.endif
-
-.if (${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb")
+.if !empty(MACHINE_ARCH:Mearm*)
ARCHDIR_SUBDIR= arm/oabi
.endif
-.if (${MACHINE_ARCH} == "earmhf" || ${MACHINE_ARCH} == "earmhfeb")
-ARCHDIR_SUBDIR= arm/oabi arm/eabi
-.endif
-
.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
ARCHDIR_SUBDIR= mips64/64 mips64/o32
.endif
@@ -32,7 +24,7 @@ ARCHDIR_SUBDIR= powerpc64/powerpc
.if (${MACHINE_ARCH} == "aarch64")
ARCHDIR_SUBDIR+= arm/eabi
-#ARCHDIR_SUBDIR+= arm/eabihf
+ARCHDIR_SUBDIR+= arm/eabihf
ARCHDIR_SUBDIR+= arm/oabi
.elif (${MACHINE_ARCH} == "aarch64eb")
ARCHDIR_SUBDIR= arm/eabi
Index: src/compat/arm/eabihf/bsd.eabihf.mk
diff -u src/compat/arm/eabihf/bsd.eabihf.mk:1.1 src/compat/arm/eabihf/bsd.eabihf.mk:1.1.2.1
--- src/compat/arm/eabihf/bsd.eabihf.mk:1.1 Sun Aug 10 23:26:25 2014
+++ src/compat/arm/eabihf/bsd.eabihf.mk Mon Jun 1 19:38:35 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.eabihf.mk,v 1.1 2014/08/10 23:26:25 matt Exp $
+# $NetBSD: bsd.eabihf.mk,v 1.1.2.1 2015/06/01 19:38:35 snj Exp $
.if !defined(MLIBDIR)
@@ -9,22 +9,22 @@ EARM_COMPAT_FLAGS+= -mabi=aapcs-linux
MKSOFTFLOAT=no
.if ${MACHINE_ARCH} == "aarch64eb"
-EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-eabihf
EARM_COMPAT_FLAGS+= -mcpu=cortex-a53
ARM_MACHINE_ARCH= earmv7hfeb
LDFLAGS+= -Wl,--be8
ARM_LD= -m armelfb_nbsd_eabihf --be8
.elif ${MACHINE_ARCH} == "aarch64"
-EARM_COMPAT_FLAGS+= -target arm--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target arm--netbsdelf-eabihf
EARM_COMPAT_FLAGS+= -mcpu=cortex-a53
ARM_MACHINE_ARCH= earmv7hf
ARM_LD= -m armelf_nbsd_eabihf
.elif !empty(MACHINE_ARCH:M*eb)
-EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target armeb--netbsdelf-eabihf
ARM_MACHINE_ARCH= earmhfeb
ARM_LD= -m armelfb_nbsd_eabihf
.else
-EARM_COMPAT_FLAGS+= -target arm--netbsdelf-gnueabi
+EARM_COMPAT_FLAGS+= -target arm--netbsdelf-eabihf
ARM_MACHINE_ARCH= earmhf
ARM_LD= -m armelf_nbsd_eabihf
.endif
Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.26.2.2 src/external/gpl3/gcc/dist/gcc/config.gcc:1.26.2.3
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.26.2.2 Sun Jan 25 00:19:27 2015
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Mon Jun 1 19:38:35 2015
@@ -897,7 +897,7 @@ arm*-*-netbsdelf*)
case ${target} in
arm*-*-netbsdelf-*eabi*)
tm_file="$tm_file arm/bpabi.h arm/netbsd-elf.h arm/netbsd-eabi.h"
- tmake_file="$tmake_file arm/t-bpabi"
+ tmake_file="$tmake_file arm/t-bpabi arm/t-netbsdeabi"
# The BPABI long long divmod functions return a 128-bit value in
# registers r0-r3. Correctly modeling that requires the use of
# TImode.
Index: src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.13 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.13.2.1
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.13 Fri May 30 18:31:31 2014
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h Mon Jun 1 19:38:35 2015
@@ -40,8 +40,6 @@
#define TARGET_LINKER_EMULATION TARGET_LINKER_LITTLE_EMULATION
#endif
-#undef MULTILIB_DEFAULTS
-
#undef ARM_DEFAULT_ABI
#define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
Added files:
Index: src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi
diff -u /dev/null src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi:1.1.2.2
--- /dev/null Mon Jun 1 19:38:35 2015
+++ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi Mon Jun 1 19:38:35 2015
@@ -0,0 +1,8 @@
+# NetBSD has (will have) "non-native" libraries in /usr/lib/<arch>.
+
+MULTILIB_OPTIONS = mabi=aapcs-linux/mabi=apcs-gnu
+MULTILIB_DIRNAMES = eabi oabi
+MULTILIB_OSDIRNAMES = . ../lib/oabi
+
+LIBGCC = stmp-multilib
+INSTALL_LIBGCC = install-multilib
