Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../gcc-4.8.2/libcpp/files.c ./libcpp/files.c |
2 | --- ../gcc-4.8.2/libcpp/files.c 2013-03-06 17:18:40.000000000 +0100 | |
3 | +++ ./libcpp/files.c 2014-01-09 00:29:34.940181542 +0100 | |
4 | @@ -716,11 +716,13 @@ | |
5 | cpp_error (pfile, CPP_DL_WARNING, | |
6 | "%s is shorter than expected", file->path); | |
7 | ||
8 | + off_t ot = (off_t) &file->st.st_size; | |
9 | file->buffer = _cpp_convert_input (pfile, | |
10 | CPP_OPTION (pfile, input_charset), | |
11 | buf, size + 16, total, | |
12 | &file->buffer_start, | |
13 | - &file->st.st_size); | |
14 | + &ot); | |
15 | + file->st.st_size = ot; | |
16 | file->buffer_valid = true; | |
17 | ||
18 | return true; | |
19 | diff -u -r ../gcc-4.8.2/libcpp/macro.c ./libcpp/macro.c | |
20 | --- ../gcc-4.8.2/libcpp/macro.c 2013-01-14 19:13:59.000000000 +0100 | |
21 | +++ ./libcpp/macro.c 2014-01-09 00:30:49.416179764 +0100 | |
22 | @@ -245,8 +245,10 @@ | |
23 | looks like "Sun Sep 16 01:03:52 1973". */ | |
24 | struct tm *tb = NULL; | |
25 | struct stat *st = _cpp_get_file_stat (file); | |
26 | - if (st) | |
27 | - tb = localtime (&st->st_mtime); | |
28 | + if (st) { | |
29 | + const time_t mtime = (const time_t) st->st_mtime; | |
30 | + tb = localtime (&mtime); | |
31 | + } | |
32 | if (tb) | |
33 | { | |
34 | char *str = asctime (tb); | |
35 | Index: gcc-4.8.1/gcc/Makefile.in | |
36 | =================================================================== | |
37 | --- ../gcc-4.8.1.orig/gcc/Makefile.in 2013-08-19 11:40:36.844014424 +0000 | |
38 | +++ ./gcc/Makefile.in 2013-08-19 11:40:37.784014402 +0000 | |
39 | @@ -3903,27 +3903,29 @@ | |
40 | ||
41 | gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H) | |
42 | gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H) | |
43 | -CFLAGS-gengtype-lex.o += -DGENERATOR_FILE | |
44 | +CFLAGS-build/gengtype-lex.o += -DGENERATOR_FILE | |
45 | build/gengtype-lex.o: $(BCONFIG_H) | |
46 | ||
47 | gengtype-parse.o build/gengtype-parse.o : gengtype-parse.c gengtype.h \ | |
48 | $(SYSTEM_H) | |
49 | gengtype-parse.o: $(CONFIG_H) | |
50 | -CFLAGS-gengtype-parse.o += -DGENERATOR_FILE | |
51 | +CFLAGS-build/gengtype-parse.o += -DGENERATOR_FILE | |
52 | build/gengtype-parse.o: $(BCONFIG_H) | |
53 | ||
54 | gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \ | |
55 | gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \ | |
56 | $(XREGEX_H) | |
57 | gengtype-state.o: $(CONFIG_H) | |
58 | -CFLAGS-gengtype-state.o += -DGENERATOR_FILE | |
59 | +CFLAGS-gengtype-state.o += -DGENERATOR_FILE2 | |
60 | +CFLAGS-build/gengtype-state.o += -DGENERATOR_FILE | |
61 | build/gengtype-state.o: $(BCONFIG_H) | |
62 | ||
63 | gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h \ | |
64 | rtl.def insn-notes.def errors.h double-int.h version.h $(HASHTAB_H) \ | |
65 | $(OBSTACK_H) $(XREGEX_H) | |
66 | gengtype.o: $(CONFIG_H) | |
67 | -CFLAGS-gengtype.o += -DGENERATOR_FILE | |
68 | +CFLAGS-gengtype.o += -DGENERATOR_FILE2 | |
69 | +CFLAGS-build/gengtype.o += -DGENERATOR_FILE | |
70 | build/gengtype.o: $(BCONFIG_H) | |
71 | ||
72 | build/genmddeps.o: genmddeps.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h \ | |
73 | @@ -3988,7 +3990,7 @@ | |
74 | # any system header is included. | |
75 | gengtype-lex.c : gengtype-lex.l | |
76 | -$(FLEX) $(FLEXFLAGS) -o$@ $< && { \ | |
77 | - echo '#include "bconfig.h"' > $@.tmp; \ | |
78 | + echo '' > $@.tmp; \ | |
79 | cat $@ >> $@.tmp; \ | |
80 | mv $@.tmp $@; \ | |
81 | } | |
82 | Index: gcc-4.8.1/gcc/double-int.h | |
83 | =================================================================== | |
84 | --- ../gcc-4.8.1.orig/gcc/double-int.h 2013-01-30 11:04:30.000000000 +0000 | |
85 | +++ ./gcc/double-int.h 2013-08-19 11:41:51.564012719 +0000 | |
86 | @@ -448,10 +448,12 @@ | |
87 | ||
88 | ||
89 | #ifndef GENERATOR_FILE | |
90 | +#ifndef GENERATOR_FILE2 | |
91 | /* Conversion to and from GMP integer representations. */ | |
92 | ||
93 | void mpz_set_double_int (mpz_t, double_int, bool); | |
94 | double_int mpz_get_double_int (const_tree, mpz_t, bool); | |
95 | #endif | |
96 | +#endif | |
97 | ||
98 | #endif /* DOUBLE_INT_H */ |