aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRong Xu <xur@google.com>2012-06-07 01:54:17 +0000
committerRong Xu <xur@google.com>2012-06-07 01:54:17 +0000
commit124d0c5ffe6d6e920b9d31ed6f438d81900981b7 (patch)
tree31176384b5ed05629d8d0a4f0bfddda2d37406bc
parentc2383fa7a531bed434034a0f6b30fa368a74b28a (diff)
2012-06-06 Rong Xu <xur@google.com>
* gcc.c (RIPA_AUX_MOD_SPEC):not passing pedantic flag to aux modules. (ripa_invoke_as):not using pipe for iro file. (ripa_build_aux_mod_func):-D define can have space. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/gcc-4_6@188292 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.google-4_67
-rw-r--r--gcc/gcc.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ChangeLog.google-4_6 b/gcc/ChangeLog.google-4_6
index aedda070e34..6edfc638d50 100644
--- a/gcc/ChangeLog.google-4_6
+++ b/gcc/ChangeLog.google-4_6
@@ -1,3 +1,10 @@
+2012-06-06 Rong Xu <xur@google.com>
+
+ * gcc.c (RIPA_AUX_MOD_SPEC):not passing pedantic flag to aux
+ modules.
+ (ripa_invoke_as):not using pipe for iro file.
+ (ripa_build_aux_mod_func):-D define can have space.
+
2012-06-04 Mark Wielaard <mjw@redhat.com>
Cary Coutant <ccoutant@google.com>
diff --git a/gcc/gcc.c b/gcc/gcc.c
index fdd9e6df642..b06c6391ce4 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -708,7 +708,7 @@ proper position among the other output files. */
#ifndef RIPA_AUX_MOD_SPEC
# define RIPA_AUX_MOD_SPEC "\
%{!Q:-quiet} %i -dumpbase %B_aux -auxbase %b\
- %{W*&pedantic*} %{w} %{fdump*} %{fopt-info*}\
+ %{w} %{fdump*} %{fopt-info*}\
%{Qn:-fno-ident} %{Qy:} %{fripa*} %{fprofile*}\
%{!fprofile-use*:-fprofile-use} -o %u.irs"
#endif
@@ -759,7 +759,7 @@ static const char *ripa_asm_options =
/* specs to call asm in streaming lipo. */
static const char *ripa_invoke_as =
-"|\n as %(ripa_asm_options) %U.irs %A\n ";
+"\n as %(ripa_asm_options) %U.irs %A\n ";
/* specs to call asm in streaming lipo. This is for the primary ir assembly
to ir object. */
@@ -8619,7 +8619,7 @@ ripa_build_aux_mod_func (int argc, const char **argv)
case 'D': /* cpp defines */
++num_d;
- str = strtok (buf+2, STR_DELIMITERS);
+ str = strtok (buf+2, "\n");
strcpy (str_buf, "-");
strcat (str_buf, str);
store_arg (xstrdup (str_buf), 0, 0);