Module Name: src
Committed By: mrg
Date: Fri Feb 1 13:12:22 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/arm: t-arm
Log Message:
fix merge botch.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/config/arm/t-arm
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/gcc/dist/gcc/config/arm/t-arm
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/t-arm:1.7 src/external/gpl3/gcc/dist/gcc/config/arm/t-arm:1.8
--- src/external/gpl3/gcc/dist/gcc/config/arm/t-arm:1.7 Sat Jan 19 12:10:05 2019
+++ src/external/gpl3/gcc/dist/gcc/config/arm/t-arm Fri Feb 1 13:12:22 2019
@@ -67,9 +67,9 @@ s-config s-conditions s-flags s-codes s-
s-opinit s-extract s-peep s-attr s-attrtab s-output: $(MD_INCLUDES)
$(srcdir)/config/arm/arm-tune.md: $(srcdir)/config/arm/parsecpu.awk \
+ $(srcdir)/config/arm/arm-cpus.in
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_config_arm_arm-tune.md:
- $(srcdir)/config/arm/arm-cpus.in
$(AWK) -f $(srcdir)/config/arm/parsecpu.awk -v cmd=md \
$(srcdir)/config/arm/arm-cpus.in > arm-tune.new
mv arm-tune.new $(srcdir)/config/arm/arm-tune.md