From 5e1e8f23cf48dd3cd32d95f385d4b491820b55cf Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 8 Oct 1996 17:15:20 +0000 Subject: [PATCH] * as.h: Include libiberty.h. (xmalloc, xrealloc): Don't declare. * as.c: Don't include libiberty.h. * expr.c, read.c, stabs.c, config/obj-coff.c: Likewise. * config/tc-mips.c: Likewise. * messages.c: Likewise. (xstrerror): Don't declare. * xmalloc.c: Remove. --- gas/.Sanitize | 1 - gas/ChangeLog | 11 +++++++++ gas/config/tc-mips.c | 4 ++- gas/xmalloc.c | 70 ---------------------------------------------------- 4 files changed, 14 insertions(+), 72 deletions(-) delete mode 100644 gas/xmalloc.c diff --git a/gas/.Sanitize b/gas/.Sanitize index 85c9d2d..eebfe6d 100644 --- a/gas/.Sanitize +++ b/gas/.Sanitize @@ -100,7 +100,6 @@ testsuite vmsconf.sh write.c write.h -xmalloc.c Things-to-lose: diff --git a/gas/ChangeLog b/gas/ChangeLog index 4b767fe..8ad6226 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,14 @@ +Tue Oct 8 13:02:21 1996 Ian Lance Taylor + + * as.h: Include libiberty.h. + (xmalloc, xrealloc): Don't declare. + * as.c: Don't include libiberty.h. + * expr.c, read.c, stabs.c, config/obj-coff.c: Likewise. + * config/tc-mips.c: Likewise. + * messages.c: Likewise. + (xstrerror): Don't declare. + * xmalloc.c: Remove. + Mon Oct 7 16:53:23 1996 Jeffrey A Law (law@cygnus.com) * config/tc-mn10300.h (pre_defined_registers) Remove. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index fc691c0..0cce278 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -25,7 +25,6 @@ #include "as.h" #include "config.h" #include "subsegs.h" -#include "libiberty.h" #include @@ -1211,6 +1210,9 @@ append_insn (place, ip, address_expr, reloc_type, unmatched_hi) break; case BFD_RELOC_MIPS_JMP: + ip->insn_opcode |= (address_expr->X_add_number >> 2) & 0x3ffffff; + break; + case BFD_RELOC_16_PCREL_S2: goto need_reloc; diff --git a/gas/xmalloc.c b/gas/xmalloc.c deleted file mode 100644 index d2639a2..0000000 --- a/gas/xmalloc.c +++ /dev/null @@ -1,70 +0,0 @@ -/* xmalloc.c - get memory or bust - - Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. - - This file is part of GAS, the GNU Assembler. - - GAS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - GAS is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -/* - NAME - xmalloc() - get memory or bust - INDEX - xmalloc() uses malloc() - - SYNOPSIS - char * my_memory; - - my_memory = xmalloc(42); / * my_memory gets address of 42 chars * / - - DESCRIPTION - - Use xmalloc() as an "error-free" malloc(). It does almost the same job. - When it cannot honour your request for memory it BOMBS your program - with a "virtual memory exceeded" message. Malloc() returns NULL and - does not bomb your program. - - SEE ALSO - malloc() - - */ - -#include "as.h" - -#define error as_fatal - -PTR -xmalloc (n) - unsigned long n; -{ - PTR retval; - - retval = malloc (n); - if (retval == NULL) - error ("virtual memory exceeded"); - return (retval); -} - -PTR -xrealloc (ptr, n) - register PTR ptr; - unsigned long n; -{ - ptr = realloc (ptr, n); - if (ptr == 0) - error ("virtual memory exceeded"); - return (ptr); -} -/* end of xmalloc.c */ -- 2.7.4