aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/avr/t-avr12
2 files changed, 16 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb791bb..49bed4d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-31 Georg-Johann Lay <avr@gjlay.de>
+
+ * config/avr/t-avr: Correct avr-mmcu.texi dependencies.
+ (s-avr-mmcu-texi): Don't sed on gen-avr-mmcu-texi output.
+ * doc/avr-mmcu.texi (svn:eol-style): Set to native.
+
2012-05-31 Richard Guenther <rguenther@suse.de>
* tree-loop-distribution.c (struct partition_s): New struct,
diff --git a/gcc/config/avr/t-avr b/gcc/config/avr/t-avr
index 20dc63a..5da9ef2 100644
--- a/gcc/config/avr/t-avr
+++ b/gcc/config/avr/t-avr
@@ -47,10 +47,18 @@ gen-avr-mmcu-texi$(build_exeext): $(srcdir)/config/avr/gen-avr-mmcu-texi.c \
$(TM_H) $(AVR_MCUS) $(srcdir)/config/avr/avr-devices.c
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< -o $@
-avr-devices.o: s-avr-mmcu-texi
+# Make sure that the -mmcu= documentation is in sync with the compiler.
+$(srcdir)/doc/avr-mmcu.texi: s-avr-mmcu-texi; @true
+# invoke.texi @includes avr-mmcu.texi. Put this dependency here instead
+# of in the global Makefile so that developers of other backends are not
+# bothered with AVR stuff.
+$(srcdir)/doc/invoke.texi: $(srcdir)/doc/avr-mmcu.texi
+
+# Ensure that device support is in sync with -mmcu= documentation.
s-avr-mmcu-texi: gen-avr-mmcu-texi$(build_exeext)
- $(RUN_GEN) ./$< | sed -e 's:\r::g' > avr-mmcu.texi
+ $(RUN_GEN) ./$< > tmp-avr-mmcu.texi
+ $(SHELL) $(srcdir)/../move-if-change tmp-avr-mmcu.texi avr-mmcu.texi
@if cmp -s $(srcdir)/doc/avr-mmcu.texi avr-mmcu.texi; then \
$(STAMP) $@; \
else \