Module Name:    src
Committed By:   christos
Date:           Sun Jun 30 16:11:11 UTC 2024

Modified Files:
        src/tools/binutils: mknative-binutils mknative-binutils.old

Log Message:
2.39 - mknative-binutils.old
2.42 - mknative-binutils


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/tools/binutils/mknative-binutils
cvs rdiff -u -r1.1 -r1.2 src/tools/binutils/mknative-binutils.old

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.15 src/tools/binutils/mknative-binutils:1.16
--- src/tools/binutils/mknative-binutils:1.15	Tue Feb  7 15:37:30 2023
+++ src/tools/binutils/mknative-binutils	Sun Jun 30 12:11:11 2024
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: mknative-binutils,v 1.15 2023/02/07 20:37:30 christos Exp $
+#	$NetBSD: mknative-binutils,v 1.16 2024/06/30 16:11:11 christos Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of src/external/gpl3/binutils
@@ -20,60 +20,61 @@ BFD_MACHINE_ARCH=$(echo ${MACHINE_ARCH} 
 ##### external/gpl3/binutils/lib/libbfd #####
 
 get_libbfd () {
-	mkdir -p $_TOP/external/gpl3/binutils/lib/libbfd/arch/$BFD_MACHINE_ARCH
+	local d=external/gpl3/binutils/lib/libbfd/arch/$BFD_MACHINE_ARCH
+	mkdir -p $_TOP/$d
 
-	{
-		getvars bfd/Makefile \
-			libbfd_la_DEPENDENCIES libbfd_la_OBJECTS DEFS \
-			INCLUDES TDEFAULTS HAVEVECS
-	} | write_mk external/gpl3/binutils/lib/libbfd/arch/$BFD_MACHINE_ARCH/defs.mk
+	getvars bfd/Makefile \
+	    libbfd_la_DEPENDENCIES libbfd_la_OBJECTS DEFS \
+	    INCLUDES TDEFAULTS HAVEVECS | write_mk $d/defs.mk
 
-	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/$BFD_MACHINE_ARCH/config.h
+	for i in bfd.h bfdver.h config.h; do
+	    write_c $d/$i < $_TMPDIR/bfd/$i
+	done
 }
 
 ##### external/gpl3/binutils/lib/libopcodes #####
 
 get_libopcodes () {
-	mkdir -p $_TOP/external/gpl3/binutils/lib/libopcodes/arch/$BFD_MACHINE_ARCH
+	local d=external/gpl3/binutils/lib/libopcodes/arch/$BFD_MACHINE_ARCH
+	mkdir -p $_TOP/$d
 
-	{
-		getvars opcodes/Makefile \
-			archdefs BFD_MACHINES libopcodes_la_SOURCES
-	} | write_mk external/gpl3/binutils/lib/libopcodes/arch/$BFD_MACHINE_ARCH/defs.mk
+	getvars opcodes/Makefile \
+	    archdefs BFD_MACHINES libopcodes_la_SOURCES | write_mk $d/defs.mk
 
-	{
-		cat $_TMPDIR/opcodes/config.h
-	} | write_c external/gpl3/binutils/lib/libopcodes/arch/$BFD_MACHINE_ARCH/config.h
+	write_c $d/config.h < $_TMPDIR/opcodes/config.h
 }
 
 get_libgnuctf () {
-	mkdir -p $_TOP/external/gpl3/binutils/lib/libgnuctf/arch/$BFD_MACHINE_ARCH
+	local d=external/gpl3/binutils/lib/libgnuctf/arch/$BFD_MACHINE_ARCH
+	mkdir -p $_TOP/$d
 
-	{
-		getvars libctf/Makefile libctf_la_SOURCES
-	} | write_mk external/gpl3/binutils/lib/libgnuctf/arch/$BFD_MACHINE_ARCH/defs.mk
+	getvars libctf/Makefile libctf_la_SOURCES | write_mk $d/defs.mk
 
-	{
-		cat $_TMPDIR/libctf/config.h
-	} | write_c external/gpl3/binutils/lib/libgnuctf/arch/$BFD_MACHINE_ARCH/config.h
+
+	write_c $d/config.h < $_TMPDIR/libctf/config.h
 }
 
 ##### external/gpl3/binutils/lib/libiberty #####
 
 get_libiberty () {
-	mkdir -p $_TOP/external/gpl3/binutils/lib/libiberty/arch/$BFD_MACHINE_ARCH
+	local d=external/gpl3/binutils/lib/libiberty/arch/$BFD_MACHINE_ARCH
+	mkdir -p $_TOP/$d
 
 	getvars libiberty/Makefile \
-		ALLOCA EXTRA_OFILES LIBOBJS REQUIRED_OFILES \
-		| write_mk external/gpl3/binutils/lib/libiberty/arch/$BFD_MACHINE_ARCH/defs.mk
+	    ALLOCA EXTRA_OFILES LIBOBJS REQUIRED_OFILES | write_mk $d/defs.mk
+
+	write_c $d/config.h < $_TMPDIR/libiberty/config.h
+}
+
+##### external/gpl3/binutils/lib/libiberty #####
+
+get_libsframe () {
+	local d=external/gpl3/binutils/lib/libsframe/arch/$BFD_MACHINE_ARCH
+	mkdir -p $_TOP/$d
+
+        getvars libsframe/Makefile libsframe_la_SOURCES | write_mk $d/defs.mk
 
-	write_c external/gpl3/binutils/lib/libiberty/arch/$BFD_MACHINE_ARCH/config.h \
-		<$_TMPDIR/libiberty/config.h
+	write_c $d/config.h < $_TMPDIR/libsframe/config.h
 }
 
 ##### external/gpl3/binutils/usr.bin #####
@@ -81,7 +82,8 @@ get_libiberty () {
 get_binutils () {
 	### common
 
-	mkdir -p $_TOP/external/gpl3/binutils/usr.bin/common/arch/$BFD_MACHINE_ARCH
+	local d=external/gpl3/binutils/usr.bin/common/arch/$BFD_MACHINE_ARCH
+	mkdir -p $_TOP/$d
 
 	{
 		getvars binutils/Makefile \
@@ -96,53 +98,55 @@ 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/$BFD_MACHINE_ARCH/defs.mk
+	} | write_mk $d/defs.mk
 
-	write_c external/gpl3/binutils/usr.bin/common/arch/$BFD_MACHINE_ARCH/config.h \
-		<$_TMPDIR/binutils/config.h
+	write_c $d/config.h < $_TMPDIR/binutils/config.h
 
 	### gas
 
-	mkdir -p $_TOP/external/gpl3/binutils/usr.bin/gas/arch/$BFD_MACHINE_ARCH
+	d=external/gpl3/binutils/usr.bin/gas/arch/$BFD_MACHINE_ARCH
+	mkdir -p $_TOP/$d
 
 	grep -v DEPDIR "$_TMPDIR/gas/Makefile" > "$_TMPDIR/gas/Makefile.nodeps"
 	getvars gas/Makefile.nodeps \
-                DEFS INCLUDES as_new_OBJECTS as_new_LDADD | 
+                DEFS INCLUDES as_new_OBJECTS as_new_LDADD |
 	sed	-e s/G_as_new_OBJECTS/G_OBJS/ \
 		-e s/G_as_new_LDADD=/G_OBJS+=/ \
 		-e s@config/@@g \
 		-e 's/\.\..*a//' |
-	write_mk external/gpl3/binutils/usr.bin/gas/arch/$BFD_MACHINE_ARCH/defs.mk
+	write_mk $d/defs.mk
 
-	for f in config itbl-cpu obj-format targ-cpu targ-env; do
-		write_c external/gpl3/binutils/usr.bin/gas/arch/$BFD_MACHINE_ARCH/$f.h <$_TMPDIR/gas/$f.h
+	for f in config.h itbl-cpu.h obj-format.h targ-cpu.h targ-env.h; do
+		write_c $d/$f < $_TMPDIR/gas/$f
 	done
 
 	### gprof
+	d=external/gpl3/binutils/usr.bin/gprof/arch/$BFD_MACHINE_ARCH
 
-	mkdir -p $_TOP/external/gpl3/binutils/usr.bin/gprof/arch/$BFD_MACHINE_ARCH
+	mkdir -p $_TOP/$d
 
 	getvars gprof/Makefile \
 		DEFS gprof_OBJECTS INCLUDES TEXINFOS \
-		| write_mk external/gpl3/binutils/usr.bin/gprof/arch/$BFD_MACHINE_ARCH/defs.mk
+		| write_mk $d/defs.mk
 
-	write_c external/gpl3/binutils/usr.bin/gprof/arch/$BFD_MACHINE_ARCH/gconfig.h <$_TMPDIR/gprof/gconfig.h
+	write_c $d/gconfig.h <$_TMPDIR/gprof/gconfig.h
 
 	### ld
 
-	mkdir -p $_TOP/external/gpl3/binutils/usr.bin/ld/arch/$BFD_MACHINE_ARCH
+	d=external/gpl3/binutils/usr.bin/ld/arch/$BFD_MACHINE_ARCH
+	mkdir -p $_TOP/$d
 
 	{
 		getvars ld/Makefile \
-			DEFS EMUL EMULATION_OFILES INCLUDES OFILES STRINGIFY TEXINFOS
+			DEFS EMUL EMULATION_OFILES INCLUDES OFILES TEXINFOS
 		getvars ld/Makefile \
 			target_alias | sed 's,[\._0-9A-Z]*$,,'
 		getvars	ld/Makefile \
 			enable_initfini_array
-	} | write_mk external/gpl3/binutils/usr.bin/ld/arch/$BFD_MACHINE_ARCH/defs.mk
+	} | write_mk $d/defs.mk
 
-	for f in config ldemul-list; do
-		write_c external/gpl3/binutils/usr.bin/ld/arch/$BFD_MACHINE_ARCH/$f.h <$_TMPDIR/ld/$f.h
+	for f in config.h ldemul-list.h; do
+		write_c $d/$f <$_TMPDIR/ld/$f
 	done
 }
 
@@ -155,6 +159,7 @@ all|binutils)	# everything (uses "canadi
 	get_libgnuctf
 	get_libopcodes
 	get_libiberty
+	get_libsframe
 	exit 0
 	;;
 

Index: src/tools/binutils/mknative-binutils.old
diff -u src/tools/binutils/mknative-binutils.old:1.1 src/tools/binutils/mknative-binutils.old:1.2
--- src/tools/binutils/mknative-binutils.old:1.1	Sat Nov 25 07:11:27 2023
+++ src/tools/binutils/mknative-binutils.old	Sun Jun 30 12:11:11 2024
@@ -1,9 +1,8 @@
 #!/bin/sh
-#	$NetBSD: mknative-binutils.old,v 1.1 2023/11/25 12:11:27 rin Exp $
-#	 NetBSD: mknative-binutils,v 1.13 2020/04/04 01:34:53 christos Exp 
+#	$NetBSD: mknative-binutils.old,v 1.2 2024/06/30 16:11:11 christos Exp $
 #
 # Shell script for generating all the constants needed for a native
-# platform build of src/external/gpl3/binutils.old
+# platform build of src/external/gpl3/binutils
 #
 
 # initialise
@@ -15,94 +14,96 @@ _VPATH=`grep VPATH ${_TMPDIR}/Makefile |
 
 . $_TOP/tools/gcc/mknative.common
 
-##### external/gpl3/binutils.old/lib/libbfd #####
+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.old/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.old/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.old/lib/libbfd/arch/$MACHINE_ARCH/bfd.h <$_TMPDIR/bfd/bfd.h
-	write_c external/gpl3/binutils.old/lib/libbfd/arch/$MACHINE_ARCH/bfdver.h <$_TMPDIR/bfd/bfdver.h
-	write_c external/gpl3/binutils.old/lib/libbfd/arch/$MACHINE_ARCH/bfd_stdint.h <$_TMPDIR/bfd/bfd_stdint.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.old/lib/libbfd/arch/$MACHINE_ARCH/config.h
+	} | write_c external/gpl3/binutils/lib/libbfd/arch/$BFD_MACHINE_ARCH/config.h
 }
 
-##### external/gpl3/binutils.old/lib/libopcodes #####
+##### external/gpl3/binutils/lib/libopcodes #####
 
 get_libopcodes () {
-	mkdir -p $_TOP/external/gpl3/binutils.old/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.old/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.old/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.old/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.old/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.old/lib/libgnuctf/arch/$MACHINE_ARCH/config.h
+	} | write_c external/gpl3/binutils/lib/libgnuctf/arch/$BFD_MACHINE_ARCH/config.h
 }
 
-##### external/gpl3/binutils.old/lib/libiberty #####
+##### external/gpl3/binutils/lib/libiberty #####
 
 get_libiberty () {
-	mkdir -p $_TOP/external/gpl3/binutils.old/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.old/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.old/lib/libiberty/arch/$MACHINE_ARCH/config.h \
+	write_c external/gpl3/binutils/lib/libiberty/arch/$BFD_MACHINE_ARCH/config.h \
 		<$_TMPDIR/libiberty/config.h
 }
 
-##### external/gpl3/binutils.old/usr.bin #####
+##### external/gpl3/binutils/usr.bin #####
 
 get_binutils () {
 	### common
 
-	mkdir -p $_TOP/external/gpl3/binutils.old/usr.bin/common/arch/$MACHINE_ARCH
+	mkdir -p $_TOP/external/gpl3/binutils/usr.bin/common/arch/$BFD_MACHINE_ARCH
 
 	{
 		getvars binutils/Makefile \
 			VERSION DEFS INCLUDES PROGRAMS
-		getvars binutils/doc/Makefile \
+		getvars binutils/Makefile \
 			man_MANS TEXINFOS
-		getvars bfd/doc/Makefile \
+		getvars bfd/Makefile \
 			PKGVERSION | sed 's,\\\(.\),\1,'
-		getvars bfd/doc/Makefile \
+		getvars bfd/Makefile \
 			REPORT_BUGS_TEXI
 
 		for f in `getvars binutils/Makefile PROGRAMS | sed 'y,-,_,;s,^[^=]*=,,'`; do
 			getvars binutils/Makefile ${f}_OBJECTS ${f}_DEPENDENCIES
 		done
-	} | write_mk external/gpl3/binutils.old/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.old/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.old/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 \
@@ -111,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.old/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.old/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.old/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.old/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.old/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.old/usr.bin/ld/arch/$MACHINE_ARCH
+	mkdir -p $_TOP/external/gpl3/binutils/usr.bin/ld/arch/$BFD_MACHINE_ARCH
 
 	{
 		getvars ld/Makefile \
@@ -138,10 +139,10 @@ get_binutils () {
 			target_alias | sed 's,[\._0-9A-Z]*$,,'
 		getvars	ld/Makefile \
 			enable_initfini_array
-	} | write_mk external/gpl3/binutils.old/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.old/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
 }
 

Reply via email to