[src/trunk]: src/external/bsd/elftoolchain/dist/common Sync with elftoolchain...

[jkoshy <jkoshy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/67a804e0c62b
branches:  trunk
changeset: 978615:67a804e0c62b
user:      jkoshy <jkoshy%NetBSD.org@localhost>
date:      Thu Nov 26 21:52:00 2020 +0000

description:
Sync with elftoolchain upstream.

diffstat:

 external/bsd/elftoolchain/dist/common/Makefile          |   6 +++---
 external/bsd/elftoolchain/dist/common/native-elf-format |  10 +++++++---
 external/bsd/elftoolchain/dist/common/os.Linux.mk       |  10 ++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diffs (81 lines):

diff -r 1f3266f53bc9 -r 67a804e0c62b external/bsd/elftoolchain/dist/common/Makefile
--- a/external/bsd/elftoolchain/dist/common/Makefile    Thu Nov 26 21:01:47 2020 +0000
+++ b/external/bsd/elftoolchain/dist/common/Makefile    Thu Nov 26 21:52:00 2020 +0000
@@ -1,4 +1,4 @@
-# Id: Makefile 3022 2014-04-17 18:05:58Z jkoshy 
+# Id: Makefile 3594 2018-04-11 18:26:50Z jkoshy
 
 TOP=   ..
 
@@ -7,12 +7,12 @@
 
 .PHONY:        all clean clobber depend obj
 
-all depend obj:
+all depend:
 
 clean clobber:
        rm -f ${CLEANFILES}
 
 cleandepend:
-       rm -f .depend
+       rm -f ${.OBJDIR}/.depend
 
 .include "${TOP}/mk/elftoolchain.inc.mk"
diff -r 1f3266f53bc9 -r 67a804e0c62b external/bsd/elftoolchain/dist/common/native-elf-format
--- a/external/bsd/elftoolchain/dist/common/native-elf-format   Thu Nov 26 21:01:47 2020 +0000
+++ b/external/bsd/elftoolchain/dist/common/native-elf-format   Thu Nov 26 21:52:00 2020 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Id: native-elf-format 3293 2016-01-07 19:26:27Z emaste 
+# Id: native-elf-format 3893 2020-11-20 17:11:04Z jkoshy
 #
 # Find the native ELF format for a host platform by compiling a
 # test object and examining the resulting object.
@@ -9,7 +9,7 @@
 # information statically at compile time.
 
 program=`basename $0`
-tmp_c=`mktemp -u nefXXXXXX`.c
+tmp_c=`mktemp ${MAKEOBJDIRPREFIX+"-p ${MAKEOBJDIRPREFIX}"} -u nefXXXXXX`.c
 tmp_o=`echo ${tmp_c} | sed -e 's/.c$/.o/'`
 
 trap "rm -f ${tmp_c} ${tmp_o}" 0 1 2 3 15
@@ -35,8 +35,12 @@
             elfarch = "EM_386";
         } else if (match($0, "MIPS")) {
             elfarch = "EM_MIPS";
-        } else if (match($0, ".*[xX]86-64")) {
+        } else if (match($0, ".*[xX]86[-_]64")) {
             elfarch = "EM_X86_64";
+        } else if (match($0, "PowerPC64")) {
+            elfarch = "EM_PPC64";
+       } else if (match($0, "ARM")) {
+           elfarch = "EM_ARM";
         } else {
             elfarch = "unknown";
         }
diff -r 1f3266f53bc9 -r 67a804e0c62b external/bsd/elftoolchain/dist/common/os.Linux.mk
--- a/external/bsd/elftoolchain/dist/common/os.Linux.mk Thu Nov 26 21:01:47 2020 +0000
+++ b/external/bsd/elftoolchain/dist/common/os.Linux.mk Thu Nov 26 21:52:00 2020 +0000
@@ -1,13 +1,15 @@
 #
 # Build recipes for Linux based operating systems.
 #
-# Id: os.Linux.mk 2064 2011-10-26 15:12:32Z jkoshy 
+# Id: os.Linux.mk 3594 2018-04-11 18:26:50Z jkoshy
 
 _NATIVE_ELF_FORMAT = native-elf-format
 
-.BEGIN:        ${_NATIVE_ELF_FORMAT}.h
+.if !make(obj)
+.BEGIN:        ${.OBJDIR}/${_NATIVE_ELF_FORMAT}.h
 
-${_NATIVE_ELF_FORMAT}.h:
+${.OBJDIR}/${_NATIVE_ELF_FORMAT}.h:
        ${.CURDIR}/${_NATIVE_ELF_FORMAT} > ${.TARGET} || rm ${.TARGET}
+.endif
 
-CLEANFILES += ${_NATIVE_ELF_FORMAT}.h
+CLEANFILES += ${.OBJDIR}/${_NATIVE_ELF_FORMAT}.h