Skip to content

R
riscv-gcc-1
Commit 4f923eb8 by Bruce Korb Committed by Bruce Korb
Options

fixinc/inclhack.def(libc1_ifdefd_memx) omit #if/#endif pair 

From-SVN: r34969
parent ee138cf8
Showing with 20 additions and 13 deletions
gcc/ChangeLog
...@@ -14,6 +14,8 @@ Tue Jul 11 16:26:17 2000 Clinton Popetz <cpopetz@cygnus.com> ...@@ -14,6 +14,8 @@ Tue Jul 11 16:26:17 2000 Clinton Popetz <cpopetz@cygnus.com>
* fixinc/fixtests.c(double_slash): obsolete * fixinc/fixtests.c(double_slash): obsolete
(else_endif_label): likewise (else_endif_label): likewise
* fixinc/inclhack.def(irix_multiline_cmnt): obsolete * fixinc/inclhack.def(irix_multiline_cmnt): obsolete
(libc1_ifdefd_memx): correct initial comment
and omit the #if/#endif pair from the memxxx declarations
* fixinc/fixincl.x: regen * fixinc/fixincl.x: regen
2000-07-11 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> 2000-07-11 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
......
gcc/fixinc/fixincl.x
...@@ -2267,12 +2267,13 @@ tTestDesc aLibc1_Ifdefd_MemxTests[] = { ...@@ -2267,12 +2267,13 @@ tTestDesc aLibc1_Ifdefd_MemxTests[] = {
*/ */
const char* apzLibc1_Ifdefd_MemxPatch[] = { const char* apzLibc1_Ifdefd_MemxPatch[] = {
"format", "format",
"%1 || defined(__cplusplus)\n\ "%1",
%2",
"/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n\ "/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n\
(#if defined\\(__STDC__\\) && __GNUC__ < 2)\n\ #if defined\\(__STDC__\\) && __GNUC__ < 2\n\
(/\\* .* \\*/\n\ (/\\* .* \\*/\n\
extern [a-z_]+ mem)", extern [a-z_]+ mem.*(\n\
[^#].*)*;)\n\
#endif",
(char*)NULL }; (char*)NULL };
/* * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * *
......
gcc/fixinc/inclhack.def
...@@ -622,7 +622,7 @@ fix = { ...@@ -622,7 +622,7 @@ fix = {
}; };
/* /*
* Remove erroneous parentheses in sym.h on Alpha OSF/1. * Remove erroneous parentheses in sym.h on Alpha OSF/1.
*/ */
fix = { fix = {
...@@ -1279,9 +1279,11 @@ fix = { ...@@ -1279,9 +1279,11 @@ fix = {
}; };
/* GNU libc1 string.h does not prototype memcpy and memcmp for gcc /*
versions > 1. That's a problem. This fix will expose the prototype * GNU libc1 string.h does not prototype memcpy and memcmp for gcc
for C++. */ * versions > 1. That's a problem. This fix will expose the prototype
* for C++.
*/
fix = { fix = {
hackname = libc1_ifdefd_memx; hackname = libc1_ifdefd_memx;
...@@ -1294,11 +1296,13 @@ fix = { ...@@ -1294,11 +1296,13 @@ fix = {
c_fix = format; c_fix = format;
select = "' is a built-in function for gcc 2\\.x\\. \\*/"; select = "' is a built-in function for gcc 2\\.x\\. \\*/";
bypass = __cplusplus; bypass = __cplusplus;
c_fix_arg = "%1 || defined(__cplusplus)\n%2"; c_fix_arg = "%1";
c_fix_arg = "/\\* `mem...' is a built-in function for gcc 2\\.x\\. \\*/\n" c_fix_arg =
"(#if defined\\(__STDC__\\) && __GNUC__ < 2)\n" '/\* `mem...\' is a built-in function for gcc 2\.x\. \*/' "\n"
"(/\\* .* \\*/\n" '#if defined\(__STDC__\) && __GNUC__ < 2' "\n"
"extern [a-z_]+ mem)"; "(/\\* .* \\*/\n"
"extern [a-z_]+ mem.*(\n[^#].*)*;)\n"
"#endif";
test_text = test_text =
"/* \\`memcpy' is a built-in function for gcc 2.x. */\n" "/* \\`memcpy' is a built-in function for gcc 2.x. */\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment