Module Name:    src
Committed By:   rin
Date:           Mon Aug 28 02:18:16 UTC 2023

Modified Files:
        src/external/gpl3/binutils/dist/ld: configure.tgt

Log Message:
binutils/ld: Clean up targets for arm

- Consistently use netbsd* instead of netbsdelf*.
- Consistently use arm*- and arm*eb- for OABI.
- Style sync with upstream codes.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/external/gpl3/binutils/dist/ld/configure.tgt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils/dist/ld/configure.tgt
diff -u src/external/gpl3/binutils/dist/ld/configure.tgt:1.44 src/external/gpl3/binutils/dist/ld/configure.tgt:1.45
--- src/external/gpl3/binutils/dist/ld/configure.tgt:1.44	Tue Feb  7 20:39:01 2023
+++ src/external/gpl3/binutils/dist/ld/configure.tgt	Mon Aug 28 02:18:16 2023
@@ -181,22 +181,26 @@ arm*-*-freebsd* | arm-*-kfreebsd*-gnu)
 			targ_emul=armelf_fbsd
 			targ_extra_emuls="armelfb_fbsd armelf"
 			;;
-
-arm*eb-*-netbsdelf*-*eabihf*)
-			targ_emul=armelfb_nbsd_eabihf;
-			targ_extra_emuls="armelf_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf" ;;
-arm*eb-*-netbsdelf*-*eabi*)
-			targ_emul=armelfb_nbsd_eabi;
-			targ_extra_emuls="armelf_nbsd_eabi armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd armelfb_nbsd armelf" ;;
-arm*-*-netbsdelf*-*eabihf*)
-			targ_emul=armelf_nbsd_eabihf;
-			targ_extra_emuls="armelfb_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf" ;;
-arm*-*-netbsdelf*-*eabi*)
-			targ_emul=armelf_nbsd_eabi;
-			targ_extra_emuls="armelfb_nbsd_eabi armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd armelfb_nbsd armelf" ;;
-arm*eb-*-netbsdelf*)	targ_emul=armelfb_nbsd;
-			targ_extra_emuls="armelf_nbsd armelf" ;;
-arm-*-netbsdelf*)	targ_emul=armelf_nbsd;
+arm*eb-*-netbsd*-*eabihf*)
+			targ_emul=armelfb_nbsd_eabihf
+			targ_extra_emuls="armelf_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf"
+			;;
+arm*eb-*-netbsd*-*eabi*)
+			targ_emul=armelfb_nbsd_eabi
+			targ_extra_emuls="armelf_nbsd_eabi armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd armelfb_nbsd armelf"
+			;;
+arm*-*-netbsd*-*eabihf*)
+			targ_emul=armelf_nbsd_eabihf
+			targ_extra_emuls="armelfb_nbsd_eabihf armelf_nbsd_eabi armelfb_nbsd_eabi armelf_nbsd armelfb_nbsd armelf"
+			;;
+arm*-*-netbsd*-*eabi*)
+			targ_emul=armelf_nbsd_eabi
+			targ_extra_emuls="armelfb_nbsd_eabi armelf_nbsd_eabihf armelfb_nbsd_eabihf armelf_nbsd armelfb_nbsd armelf"
+			;;
+arm*eb-*-netbsd*)	targ_emul=armelfb_nbsd
+			targ_extra_emuls="armelf_nbsd armelf"
+			;;
+arm*-*-netbsd*)		targ_emul=armelf_nbsd
  			targ_extra_emuls="armelfb_nbsd armelf"
  			;;
 arm-*-nto*)		targ_emul=armnto

Reply via email to