Fix PR 36907, breakage in building libobj with function specific changes

From-SVN: r138091

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b93a7c36699c6a65c2e4caf81d3ef2eb15719cd..9251ca3ca65dd53d17a13fb75328e9392f446dda 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-23  Michael Meissner  <gnu@the-meissners.org>
+
+       PR 36907
+       * opth-gen.awk: Suppress function specific features when building
+       target libraries.
+       * optc-gen.awk: Ditto.
+
 2008-07-23  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
 
        PR 35058

diff --git a/gcc/optc-gen.awk b/gcc/optc-gen.awk
index 845efb4a5157d99fb5c7e066513acd700738269f..d53ba69aa76c11ff991b92a3d2db7fdc47b60062 100644 (file)
--- a/gcc/optc-gen.awk
+++ b/gcc/optc-gen.awk
@@ -225,7 +225,7 @@ for (i = 0; i < n_opts; i++) {
 print "};"
 
 print "";
-print "#if !defined(GCC_DRIVER) && !defined(IN_LIBGCC2)"
+print "#if !defined(GCC_DRIVER) && !defined(IN_LIBGCC2) && !defined(IN_TARGET_LIBS)"
 print "";
 print "/* Save optimization variables into a structure.  */"
 print "void";

diff --git a/gcc/opth-gen.awk b/gcc/opth-gen.awk
index 7c1d92ac4fa94542741c8e0196d63847a77bff71..a67e5b77a8b97fd1a6cea89a1d8ec10288f64e40 100644 (file)
--- a/gcc/opth-gen.awk
+++ b/gcc/opth-gen.awk
@@ -95,7 +95,7 @@ print ""
 # Also, order the structure so that pointer fields occur first, then int
 # fields, and then char fields to provide the best packing.
 
-print "#if !defined(GCC_DRIVER) && !defined(IN_LIBGCC2)"
+print "#if !defined(GCC_DRIVER) && !defined(IN_LIBGCC2) && !defined(IN_TARGET_LIBS)"
 print ""
 print "/* Structure to save/restore optimization and target specific options.  */";
 print "struct cl_optimization GTY(())";