Module Name: src Committed By: christos Date: Tue Feb 7 20:37:30 UTC 2023
Modified Files: src/tools/binutils: mknative-binutils Log Message: remap arm directory names, the same way the source does. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/tools/binutils/mknative-binutils Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/tools/binutils/mknative-binutils diff -u src/tools/binutils/mknative-binutils:1.14 src/tools/binutils/mknative-binutils:1.15 --- src/tools/binutils/mknative-binutils:1.14 Sat Dec 24 15:17:46 2022 +++ src/tools/binutils/mknative-binutils Tue Feb 7 15:37:30 2023 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mknative-binutils,v 1.14 2022/12/24 20:17:46 christos Exp $ +# $NetBSD: mknative-binutils,v 1.15 2023/02/07 20:37:30 christos Exp $ # # Shell script for generating all the constants needed for a native # platform build of src/external/gpl3/binutils @@ -14,62 +14,65 @@ _VPATH=`grep VPATH ${_TMPDIR}/Makefile | . $_TOP/tools/gcc/mknative.common +BFD_MACHINE_ARCH=$(echo ${MACHINE_ARCH} | sed -e 's/armv[4-7]/arm/') + + ##### external/gpl3/binutils/lib/libbfd ##### get_libbfd () { - mkdir -p $_TOP/external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH + mkdir -p $_TOP/external/gpl3/binutils/lib/libbfd/arch/$BFD_MACHINE_ARCH { getvars bfd/Makefile \ libbfd_la_DEPENDENCIES libbfd_la_OBJECTS DEFS \ INCLUDES TDEFAULTS HAVEVECS - } | write_mk external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/defs.mk + } | write_mk external/gpl3/binutils/lib/libbfd/arch/$BFD_MACHINE_ARCH/defs.mk - write_c external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/bfd.h <$_TMPDIR/bfd/bfd.h - write_c external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/bfdver.h <$_TMPDIR/bfd/bfdver.h + write_c external/gpl3/binutils/lib/libbfd/arch/$BFD_MACHINE_ARCH/bfd.h <$_TMPDIR/bfd/bfd.h + write_c external/gpl3/binutils/lib/libbfd/arch/$BFD_MACHINE_ARCH/bfdver.h <$_TMPDIR/bfd/bfdver.h { cat $_TMPDIR/bfd/config.h - } | write_c external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/config.h + } | write_c external/gpl3/binutils/lib/libbfd/arch/$BFD_MACHINE_ARCH/config.h } ##### external/gpl3/binutils/lib/libopcodes ##### get_libopcodes () { - mkdir -p $_TOP/external/gpl3/binutils/lib/libopcodes/arch/$MACHINE_ARCH + mkdir -p $_TOP/external/gpl3/binutils/lib/libopcodes/arch/$BFD_MACHINE_ARCH { getvars opcodes/Makefile \ archdefs BFD_MACHINES libopcodes_la_SOURCES - } | write_mk external/gpl3/binutils/lib/libopcodes/arch/$MACHINE_ARCH/defs.mk + } | write_mk external/gpl3/binutils/lib/libopcodes/arch/$BFD_MACHINE_ARCH/defs.mk { cat $_TMPDIR/opcodes/config.h - } | write_c external/gpl3/binutils/lib/libopcodes/arch/$MACHINE_ARCH/config.h + } | write_c external/gpl3/binutils/lib/libopcodes/arch/$BFD_MACHINE_ARCH/config.h } get_libgnuctf () { - mkdir -p $_TOP/external/gpl3/binutils/lib/libgnuctf/arch/$MACHINE_ARCH + mkdir -p $_TOP/external/gpl3/binutils/lib/libgnuctf/arch/$BFD_MACHINE_ARCH { getvars libctf/Makefile libctf_la_SOURCES - } | write_mk external/gpl3/binutils/lib/libgnuctf/arch/$MACHINE_ARCH/defs.mk + } | write_mk external/gpl3/binutils/lib/libgnuctf/arch/$BFD_MACHINE_ARCH/defs.mk { cat $_TMPDIR/libctf/config.h - } | write_c external/gpl3/binutils/lib/libgnuctf/arch/$MACHINE_ARCH/config.h + } | write_c external/gpl3/binutils/lib/libgnuctf/arch/$BFD_MACHINE_ARCH/config.h } ##### external/gpl3/binutils/lib/libiberty ##### get_libiberty () { - mkdir -p $_TOP/external/gpl3/binutils/lib/libiberty/arch/$MACHINE_ARCH + mkdir -p $_TOP/external/gpl3/binutils/lib/libiberty/arch/$BFD_MACHINE_ARCH getvars libiberty/Makefile \ ALLOCA EXTRA_OFILES LIBOBJS REQUIRED_OFILES \ - | write_mk external/gpl3/binutils/lib/libiberty/arch/$MACHINE_ARCH/defs.mk + | write_mk external/gpl3/binutils/lib/libiberty/arch/$BFD_MACHINE_ARCH/defs.mk - write_c external/gpl3/binutils/lib/libiberty/arch/$MACHINE_ARCH/config.h \ + write_c external/gpl3/binutils/lib/libiberty/arch/$BFD_MACHINE_ARCH/config.h \ <$_TMPDIR/libiberty/config.h } @@ -78,7 +81,7 @@ get_libiberty () { get_binutils () { ### common - mkdir -p $_TOP/external/gpl3/binutils/usr.bin/common/arch/$MACHINE_ARCH + mkdir -p $_TOP/external/gpl3/binutils/usr.bin/common/arch/$BFD_MACHINE_ARCH { getvars binutils/Makefile \ @@ -93,14 +96,14 @@ get_binutils () { for f in `getvars binutils/Makefile PROGRAMS | sed 'y,-,_,;s,^[^=]*=,,'`; do getvars binutils/Makefile ${f}_OBJECTS ${f}_DEPENDENCIES done - } | write_mk external/gpl3/binutils/usr.bin/common/arch/$MACHINE_ARCH/defs.mk + } | write_mk external/gpl3/binutils/usr.bin/common/arch/$BFD_MACHINE_ARCH/defs.mk - write_c external/gpl3/binutils/usr.bin/common/arch/$MACHINE_ARCH/config.h \ + write_c external/gpl3/binutils/usr.bin/common/arch/$BFD_MACHINE_ARCH/config.h \ <$_TMPDIR/binutils/config.h ### gas - mkdir -p $_TOP/external/gpl3/binutils/usr.bin/gas/arch/$MACHINE_ARCH + mkdir -p $_TOP/external/gpl3/binutils/usr.bin/gas/arch/$BFD_MACHINE_ARCH grep -v DEPDIR "$_TMPDIR/gas/Makefile" > "$_TMPDIR/gas/Makefile.nodeps" getvars gas/Makefile.nodeps \ @@ -109,25 +112,25 @@ get_binutils () { -e s/G_as_new_LDADD=/G_OBJS+=/ \ -e s@config/@@g \ -e 's/\.\..*a//' | - write_mk external/gpl3/binutils/usr.bin/gas/arch/$MACHINE_ARCH/defs.mk + write_mk external/gpl3/binutils/usr.bin/gas/arch/$BFD_MACHINE_ARCH/defs.mk for f in config itbl-cpu obj-format targ-cpu targ-env; do - write_c external/gpl3/binutils/usr.bin/gas/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gas/$f.h + write_c external/gpl3/binutils/usr.bin/gas/arch/$BFD_MACHINE_ARCH/$f.h <$_TMPDIR/gas/$f.h done ### gprof - mkdir -p $_TOP/external/gpl3/binutils/usr.bin/gprof/arch/$MACHINE_ARCH + mkdir -p $_TOP/external/gpl3/binutils/usr.bin/gprof/arch/$BFD_MACHINE_ARCH getvars gprof/Makefile \ DEFS gprof_OBJECTS INCLUDES TEXINFOS \ - | write_mk external/gpl3/binutils/usr.bin/gprof/arch/$MACHINE_ARCH/defs.mk + | write_mk external/gpl3/binutils/usr.bin/gprof/arch/$BFD_MACHINE_ARCH/defs.mk - write_c external/gpl3/binutils/usr.bin/gprof/arch/$MACHINE_ARCH/gconfig.h <$_TMPDIR/gprof/gconfig.h + write_c external/gpl3/binutils/usr.bin/gprof/arch/$BFD_MACHINE_ARCH/gconfig.h <$_TMPDIR/gprof/gconfig.h ### ld - mkdir -p $_TOP/external/gpl3/binutils/usr.bin/ld/arch/$MACHINE_ARCH + mkdir -p $_TOP/external/gpl3/binutils/usr.bin/ld/arch/$BFD_MACHINE_ARCH { getvars ld/Makefile \ @@ -136,10 +139,10 @@ get_binutils () { target_alias | sed 's,[\._0-9A-Z]*$,,' getvars ld/Makefile \ enable_initfini_array - } | write_mk external/gpl3/binutils/usr.bin/ld/arch/$MACHINE_ARCH/defs.mk + } | write_mk external/gpl3/binutils/usr.bin/ld/arch/$BFD_MACHINE_ARCH/defs.mk for f in config ldemul-list; do - write_c external/gpl3/binutils/usr.bin/ld/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/ld/$f.h + write_c external/gpl3/binutils/usr.bin/ld/arch/$BFD_MACHINE_ARCH/$f.h <$_TMPDIR/ld/$f.h done }