Permalink
Browse files

Merge pull request #101 from juikim/master

Update FreeBSD support to include 10.x-CURRENT (and few minor fixes)
  • Loading branch information...
2 parents e392b69 + e28e5fa commit 82e95b431c725012c62330750d551804324db53f @cbergstrom cbergstrom committed Oct 7, 2011
Showing with 8 additions and 4 deletions.
  1. +2 −0 GCC/gcc/config.gcc
  2. +3 −3 src/be/opt/opt_etable.cxx
  3. +2 −0 src/be/opt/opt_verify.cxx
  4. +1 −1 src/libelf/lib/update.c
View
@@ -426,6 +426,8 @@ case ${target} in
tm_defines="${tm_defines} FBSD_MAJOR=8" ;;
*-*-freebsd9 | *-*-freebsd[9].*)
tm_defines="${tm_defines} FBSD_MAJOR=9" ;;
+ *-*-freebsd10 | *-*-freebsd10.*)
+ tm_defines="${tm_defines} FBSD_MAJOR=10" ;;
*)
echo 'Please update *-*-freebsd* in gcc/config.gcc'
exit 1
@@ -2829,9 +2829,9 @@ ETABLE::Bottom_up_cr(STMTREP *stmt, INT stmt_kid_num, CODEREP *cr,
if (same_base && WOPT_Enable_Ivar_PRE && cr->Ivar_has_e_num()) {
#if defined( KEY)
if (WOPT_Enable_Preserve_Mem_Opnds && opc != OPCODE_UNKNOWN &&
+ MTYPE_is_float(OPCODE_rtype(opc)) &&
(OPCODE_operator(opc) == OPR_ADD ||
OPCODE_operator(opc) == OPR_SUB ||
- MTYPE_is_float(OPCODE_rtype(opc)) &&
OPCODE_operator(opc) == OPR_MPY)) {
}
else
@@ -3420,8 +3420,8 @@ ETABLE::Recursive_rehash_and_replace(CODEREP *x,
if (WOPT_Enable_Preserve_Mem_Opnds && opc != OPCODE_UNKNOWN &&
MTYPE_is_float(OPCODE_rtype(opc)) &&
(OPCODE_operator(opc) == OPR_ADD ||
- OPCODE_operator(opc) == OPR_MPY ||
- OPCODE_operator(opc) == OPR_SUB)) {
+ OPCODE_operator(opc) == OPR_SUB ||
+ OPCODE_operator(opc) == OPR_MPY)) {
}
else
#endif
@@ -443,6 +443,8 @@ Cur_stmt_is_entry_chi(void)
{
#ifdef Is_True_On
return (cur_stmt->Opr() == OPR_OPT_CHI);
+#else
+ return TRUE;
#endif
}
View
@@ -936,7 +936,7 @@ elf_update(Elf *elf, Elf_Cmd cmd) {
if (elf->e_fd == -1) {
seterr(ERROR_FDMISMATCH);
- return 0;
+ return -1;
}
elf_assert(elf->e_magic == ELF_MAGIC);

0 comments on commit 82e95b4

Please sign in to comment.