Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/gcc/dist/gcc/config/arm fix merge botch.



details:   https://anonhg.NetBSD.org/src/rev/5dd1e54995c5
branches:  trunk
changeset: 448412:5dd1e54995c5
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Feb 01 13:12:22 2019 +0000

description:
fix merge botch.

diffstat:

 external/gpl3/gcc/dist/gcc/config/arm/t-arm |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (14 lines):

diff -r 03a68b3da6f0 -r 5dd1e54995c5 external/gpl3/gcc/dist/gcc/config/arm/t-arm
--- a/external/gpl3/gcc/dist/gcc/config/arm/t-arm       Fri Feb 01 12:49:21 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/arm/t-arm       Fri Feb 01 13:12:22 2019 +0000
@@ -67,9 +67,9 @@
        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



Home | Main Index | Thread Index | Old Index