diff options
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/config/openbsd.h | 20 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/loop.c | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/protector.c | 3 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/toplev.c | 1 |
4 files changed, 15 insertions, 11 deletions
diff --git a/gnu/usr.bin/gcc/gcc/config/openbsd.h b/gnu/usr.bin/gcc/gcc/config/openbsd.h index 16c3d876641..86e4494bcd6 100644 --- a/gnu/usr.bin/gcc/gcc/config/openbsd.h +++ b/gnu/usr.bin/gcc/gcc/config/openbsd.h @@ -62,20 +62,20 @@ Boston, MA 02111-1307, USA. */ #ifdef CROSS_COMPILE #define INCLUDE_DEFAULTS \ { \ - { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, \ - { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1 },\ - { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1 }, \ - { GPLUSPLUS_INCLUDE_DIR "/..", STANDARD_INCLUDE_COMPONENT, 0, 0 }, \ - { 0, 0, 0, 0 } \ + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0 }, \ + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 0 },\ + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0 }, \ + { GPLUSPLUS_INCLUDE_DIR "/..", STANDARD_INCLUDE_COMPONENT, 0, 0, 0 }, \ + { 0, 0, 0, 0, 0 } \ } #else #define INCLUDE_DEFAULTS \ { \ - { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, \ - { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1 },\ - { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1 }, \ - { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0 }, \ - { 0, 0, 0, 0 } \ + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0 }, \ + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 0 },\ + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0 }, \ + { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 0 }, \ + { 0, 0, 0, 0, 0 } \ } #endif diff --git a/gnu/usr.bin/gcc/gcc/loop.c b/gnu/usr.bin/gcc/gcc/loop.c index e2d5025c265..66d7172b3fe 100644 --- a/gnu/usr.bin/gcc/gcc/loop.c +++ b/gnu/usr.bin/gcc/gcc/loop.c @@ -1797,6 +1797,7 @@ add_label_notes (x, insns) } } +#if 0 /* verified to cause bad code generation on OpenBSD/powerpc */ /* Scan MOVABLES, and move the insns that deserve to be moved. If two matching movables are combined, replace one reg with the other throughout. */ @@ -2309,6 +2310,7 @@ move_movables (loop, movables, threshold, insn_count) free (reg_map); free (already_moved); } +#endif static void diff --git a/gnu/usr.bin/gcc/gcc/protector.c b/gnu/usr.bin/gcc/gcc/protector.c index e77d2cb4144..926e12257ca 100644 --- a/gnu/usr.bin/gcc/gcc/protector.c +++ b/gnu/usr.bin/gcc/gcc/protector.c @@ -25,6 +25,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "rtl.h" #include "tree.h" #include "regs.h" +#include "tm_p.h" #include "flags.h" #include "insn-config.h" #include "insn-flags.h" @@ -2438,7 +2439,7 @@ push_frame_in_operand (insn, orig, push_size, boundary) && GET_CODE (XEXP (x, 1)) == REG && fp_equiv[REGNO (XEXP (x, 1))]) if (REGNO (XEXP (x, 0)) <= LAST_VIRTUAL_REGISTER - || reg_renumber != 0 && reg_renumber[REGNO (XEXP (x, 0))] >= 0) + || (reg_renumber != 0 && reg_renumber[REGNO (XEXP (x, 0))] >= 0)) fp_equiv[REGNO (XEXP (x, 0))] = fp_equiv[REGNO (XEXP (x, 1))]; break; diff --git a/gnu/usr.bin/gcc/gcc/toplev.c b/gnu/usr.bin/gcc/gcc/toplev.c index 4638a371856..40b13a95d6e 100644 --- a/gnu/usr.bin/gcc/gcc/toplev.c +++ b/gnu/usr.bin/gcc/gcc/toplev.c @@ -71,6 +71,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "target.h" #include "langhooks.h" #include "cfglayout.h" +#include "protector.h" #if defined (DWARF2_UNWIND_INFO) || defined (DWARF2_DEBUGGING_INFO) #include "dwarf2out.h" |