PERFORCE change 55344 for review
Peter Wemm
peter at FreeBSD.org
Sun Jun 20 01:17:11 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=55344
Change 55344 by peter at peter_daintree on 2004/06/20 01:16:11
IFC @55342
Affected files ...
.. //depot/projects/hammer/contrib/gcc/config/i386/i386.c#11 integrate
.. //depot/projects/hammer/contrib/gdb/ChangeLog#2 delete
.. //depot/projects/hammer/contrib/gdb/MAINTAINERS#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-96#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-97#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/ChangeLog-98#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/command.c#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/config/i386/nm-sun386.h#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/config/i386/sun386.mh#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/config/i386/sun386.mt#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-fbsd.h#3 integrate
.. //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-sun386.h#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-i386lynx.h#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-linux.h#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-sun386.h#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/config/i386/xm-windows.h#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/defs.h#2 integrate
.. //depot/projects/hammer/contrib/gdb/gdb/doc/libgdb.texinfo#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/gdba.el#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/gdbreplay.c#3 integrate
.. //depot/projects/hammer/contrib/gdb/gdb/gdbserver/low-linux.c#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/gnu-regex.c#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/gnu-regex.h#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/hp-psymtab-read.c#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/hp-symtab-read.c#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/hpread.h#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/i386bsd-nat.c#3 integrate
.. //depot/projects/hammer/contrib/gdb/gdb/jv-exp.tab.c#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/partial-stab.h#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/signals.h#2 delete
.. //depot/projects/hammer/contrib/gdb/gdb/target.c#2 integrate
.. //depot/projects/hammer/contrib/gdb/gdb/target.h#2 integrate
.. //depot/projects/hammer/contrib/gdb/gdb/version.in#3 integrate
.. //depot/projects/hammer/contrib/smbfs/lib/smb/rap.c#4 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#29 integrate
.. //depot/projects/hammer/etc/rc.d/syscons#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#9 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.alpha#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#6 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.i386#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.ia64#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/config.h.fbsd#5 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/ia64/bfd.h#4 integrate
.. //depot/projects/hammer/gnu/usr.bin/binutils/libiberty/Makefile#6 integrate
.. //depot/projects/hammer/lib/libarchive/archive_entry.c#10 integrate
.. //depot/projects/hammer/lib/libkvm/kvm_proc.c#19 integrate
.. //depot/projects/hammer/lib/msun/i387/s_ilogb.S#2 integrate
.. //depot/projects/hammer/lib/msun/man/ieee.3#3 integrate
.. //depot/projects/hammer/lib/msun/man/math.3#2 integrate
.. //depot/projects/hammer/lib/msun/src/math.h#15 integrate
.. //depot/projects/hammer/sbin/conscontrol/conscontrol.8#4 integrate
.. //depot/projects/hammer/sbin/conscontrol/conscontrol.c#3 integrate
.. //depot/projects/hammer/sbin/dump/optr.c#8 integrate
.. //depot/projects/hammer/sbin/sunlabel/sunlabel.c#9 integrate
.. //depot/projects/hammer/share/man/man4/netintro.4#4 integrate
.. //depot/projects/hammer/share/man/man4/watchdog.4#4 integrate
.. //depot/projects/hammer/share/man/man4/xl.4#5 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#29 integrate
.. //depot/projects/hammer/share/mk/bsd.kmod.mk#2 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#84 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#39 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0.c#2 integrate
.. //depot/projects/hammer/sys/arm/sa11x0/sa11x0_ost.c#2 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#16 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#7 integrate
.. //depot/projects/hammer/sys/contrib/dev/ath/freebsd/ah_osdep.c#4 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#11 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSynch.c#7 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#22 integrate
.. //depot/projects/hammer/sys/dev/firewire/sbp.c#30 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#36 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs.h#35 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#35 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#6 integrate
.. //depot/projects/hammer/sys/geom/geom_dev.c#24 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#2 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#3 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#3 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_volume.c#3 integrate
.. //depot/projects/hammer/sys/i386/i386/machdep.c#36 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#38 integrate
.. //depot/projects/hammer/sys/i386/include/pmap.h#15 integrate
.. //depot/projects/hammer/sys/i386/isa/npx.c#20 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#27 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#29 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#32 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#53 integrate
.. //depot/projects/hammer/sys/kern/subr_prf.c#16 integrate
.. //depot/projects/hammer/sys/kern/sysv_shm.c#13 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket.c#27 integrate
.. //depot/projects/hammer/sys/kern/uipc_socket2.c#22 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#28 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#30 integrate
.. //depot/projects/hammer/sys/net/pfil.h#3 integrate
.. //depot/projects/hammer/sys/netinet/ip_input.c#32 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#16 integrate
.. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#15 integrate
.. //depot/projects/hammer/sys/sys/_lock.h#3 integrate
.. //depot/projects/hammer/sys/sys/_types.h#11 integrate
.. //depot/projects/hammer/sys/sys/file.h#8 integrate
.. //depot/projects/hammer/sys/sys/kernel.h#9 integrate
.. //depot/projects/hammer/sys/sys/proc.h#53 integrate
.. //depot/projects/hammer/sys/sys/sysctl.h#18 integrate
.. //depot/projects/hammer/sys/sys/types.h#18 integrate
.. //depot/projects/hammer/sys/sys/user.h#12 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#21 integrate
.. //depot/projects/hammer/sys/vm/vm_page.c#29 integrate
.. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#15 integrate
Differences ...
==== //depot/projects/hammer/contrib/gcc/config/i386/i386.c#11 (text+ko) ====
@@ -20,7 +20,7 @@
Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.18 2003/11/07 03:17:46 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.20 2004/06/19 20:40:00 obrien Exp $ */
#include "config.h"
==== //depot/projects/hammer/contrib/gdb/gdb/config/i386/tm-fbsd.h#3 (text+ko) ====
@@ -18,8 +18,6 @@
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/gdb/gdb/config/i386/tm-fbsd.h,v 1.4 2002/10/12 17:56:56 mp Exp $ */
-
#ifndef TM_FBSD_H
#define TM_FBSD_H
==== //depot/projects/hammer/contrib/gdb/gdb/defs.h#2 (text+ko) ====
@@ -21,8 +21,6 @@
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/gdb/gdb/defs.h,v 1.5 2002/06/28 01:13:52 obrien Exp $ */
-
#ifndef DEFS_H
#define DEFS_H
@@ -812,6 +810,10 @@
struct frame_info;
+/* From readline (but not in any readline .h files). */
+
+extern char *tilde_expand (char *);
+
/* Control types for commands */
enum misc_command_type
==== //depot/projects/hammer/contrib/gdb/gdb/gdbserver/gdbreplay.c#3 (text+ko) ====
@@ -19,8 +19,6 @@
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/gdb/gdb/gdbserver/gdbreplay.c,v 1.6 2002/10/12 17:56:57 mp Exp $ */
-
#include "config.h"
#include <stdio.h>
#include <sys/file.h>
@@ -32,15 +30,6 @@
#include <ctype.h>
#include <fcntl.h>
#include <errno.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
==== //depot/projects/hammer/contrib/gdb/gdb/i386bsd-nat.c#3 (text+ko) ====
@@ -18,8 +18,6 @@
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/gdb/gdb/i386bsd-nat.c,v 1.2 2002/10/21 05:33:05 phk Exp $ */
-
#include "defs.h"
#include "inferior.h"
#include "regcache.h"
@@ -307,7 +305,7 @@
/* For some mysterious reason, some of the reserved bits in the
debug control register get set. Mask these off, otherwise the
ptrace call below will fail. */
- dbregs.dr[7] &= ~(0x0000fc00);
+ dbregs.dr7 &= ~(0x0000fc00);
DBREG_DRX ((&dbregs), regnum) = value;
@@ -356,7 +354,7 @@
return 0;
#endif
- return dbregs.dr[6];
+ return dbregs.dr6;
}
#endif /* PT_GETDBREGS */
==== //depot/projects/hammer/contrib/gdb/gdb/target.c#2 (text+ko) ====
@@ -21,8 +21,6 @@
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/gdb/gdb/target.c,v 1.4 2002/06/29 00:42:52 obrien Exp $ */
-
#include "defs.h"
#include <errno.h>
#include "gdb_string.h"
@@ -1363,11 +1361,7 @@
for (t = target_structs; t < target_structs + target_struct_size;
++t)
{
-#if defined(__FreeBSD__)
- if ((*t)->to_stratum == (kernel_debugging ? kcore_stratum : core_stratum))
-#else
if ((*t)->to_stratum == core_stratum)
-#endif
{
runable = *t;
++count;
==== //depot/projects/hammer/contrib/gdb/gdb/target.h#2 (text+ko) ====
@@ -20,8 +20,6 @@
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/gdb/gdb/target.h,v 1.4 2002/06/29 00:42:52 obrien Exp $ */
-
#if !defined (TARGET_H)
#define TARGET_H
@@ -54,7 +52,6 @@
dummy_stratum, /* The lowest of the low */
file_stratum, /* Executable files, etc */
core_stratum, /* Core dump files */
- kcore_stratum, /* Kernel core files */
download_stratum, /* Downloading of remote targets */
process_stratum, /* Executing processes */
thread_stratum /* Executing threads */
==== //depot/projects/hammer/contrib/gdb/gdb/version.in#3 (text+ko) ====
@@ -1,1 +1,1 @@
-5.2.1 (FreeBSD)
+5.2.1
==== //depot/projects/hammer/contrib/smbfs/lib/smb/rap.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*
* $Id: rap.c,v 1.8 2001/02/24 15:56:05 bp Exp $
- * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.2 2003/07/26 04:02:22 peter Exp $
+ * $FreeBSD: src/contrib/smbfs/lib/smb/rap.c,v 1.4 2004/06/19 19:03:01 le Exp $
*
* This is very simple implementation of RAP protocol.
*/
@@ -199,7 +199,7 @@
rap = malloc(sizeof(*rap));
if (rap == NULL)
- return NULL;
+ return ENOMEM;
bzero(rap, sizeof(*rap));
p = rap->r_sparam = rap->r_nparam = strdup(param);
rap->r_sdata = rap->r_ndata = strdup(data);
==== //depot/projects/hammer/etc/defaults/rc.conf#29 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.208 2004/06/02 09:58:18 ume Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.209 2004/06/18 20:09:29 green Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -347,6 +347,7 @@
### System console options #################################
##############################################################
+keyboard="" # keyboard device to use (default /dev/kbd0).
keymap="NO" # keymap in /usr/share/syscons/keymaps/* (or NO).
keyrate="NO" # keyboard rate to: slow, normal, fast (or NO).
keybell="NO" # See kbdcontrol(1) for options. Use "off" to disable.
==== //depot/projects/hammer/etc/rc.d/syscons#5 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/syscons,v 1.11 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/syscons,v 1.12 2004/06/18 20:09:30 green Exp $
#
# PROVIDE: syscons
@@ -59,6 +59,13 @@
{
echo -n 'Configuring syscons:'
+ # keyboard
+ #
+ if [ -n "${keyboard}" ]; then
+ echo -n ' keyboard'; kbdcontrol < ${kbddev} \
+ -k "${keyboard}" >/dev/null
+ fi
+
# keymap
#
case ${keymap} in
==== //depot/projects/hammer/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#6 (text+ko) ====
@@ -1,8 +1,6 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h,v 1.6 2004/06/16 07:09:35 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/as/ia64-freebsd/config.h,v 1.7 2004/06/19 23:18:14 marcel Exp $ */
-#define HAVE_DECL_GETOPT 1
-
-/* config.h. Generated automatically by configure. */
+/* config.h. Generated by configure. */
/* config.in. Generated automatically from configure.in by autoheader. */
/* Define if using alloca.c. */
@@ -30,9 +28,6 @@
/* Define to `long' if <sys/types.h> doesn't define. */
/* #undef off_t */
-/* Define if you need to in order for stat and other things to work. */
-/* #undef _POSIX_SOURCE */
-
/* Define to `unsigned' if <sys/types.h> doesn't define. */
/* #undef size_t */
@@ -145,13 +140,13 @@
/* #undef HAVE_VALUES_H */
/* Define if you have the <varargs.h> header file. */
-#define HAVE_VARARGS_H 1
+/* #undef HAVE_VARARGS_H */
/* Name of package */
#define PACKAGE "gas"
/* Version number of package */
-/* #define VERSION "2.12" */
+/* #define VERSION "2.15" */
/* Define if defaulting to ELF on SCO 5. */
/* #undef SCO_ELF */
@@ -165,8 +160,17 @@
/* Define as 1 if big endian. */
/* #undef TARGET_BYTES_BIG_ENDIAN */
-/* Use ELF stabs for MIPS, not ECOFF stabs */
-/* #undef MIPS_STABS_ELF */
+/* Default CPU for MIPS targets. */
+/* #undef MIPS_CPU_STRING_DEFAULT */
+
+/* Allow use of E_MIPS_ABI_O32 on MIPS targets. */
+/* #undef USE_E_MIPS_ABI_O32 */
+
+/* Generate 64-bit code by default on MIPS targets. */
+/* #undef MIPS_DEFAULT_64BIT */
+
+/* Choose a default ABI for MIPS targets. */
+/* #undef MIPS_DEFAULT_ABI */
/* Default architecture. */
/* #undef DEFAULT_ARCH */
@@ -217,7 +221,7 @@
/* #undef USE_EMULATIONS */
/* Supported emulations. */
-#define EMULATIONS
+#define EMULATIONS
/* Default emulation. */
#define DEFAULT_EMULATION ""
@@ -229,19 +233,19 @@
#define BFD_ASSEMBLER 1
/* Target alias. */
-#define TARGET_ALIAS "ia64-obrien-freebsd5"
+/* #define TARGET_ALIAS "ia64-unknown-freebsd5.2" */
/* Canonical target. */
-#define TARGET_CANONICAL "ia64-obrien-freebsd5"
+/* #define TARGET_CANONICAL "ia64-unknown-freebsd5.2" */
/* Target CPU. */
#define TARGET_CPU "ia64"
/* Target vendor. */
-#define TARGET_VENDOR "obrien"
+#define TARGET_VENDOR "unknown"
/* Target OS. */
-#define TARGET_OS "freebsd5"
+#define TARGET_OS "freebsd5.2"
/* Define if you have the stpcpy function */
#define HAVE_STPCPY 1
@@ -278,3 +282,4 @@
/* Define if errno is not declared in system header files. */
/* #undef NEED_DECLARATION_ERRNO */
+
==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#9 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.28 2004/06/16 07:09:38 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.31 2004/06/19 20:50:57 marcel Exp $
.include "../Makefile.inc0"
.PATH: ${SRCDIR}/bfd ${SRCDIR}/opcodes
LIB= bfd
-SRCS+= archive.c archive64.c archures.c bfd.c binary.c cache.c \
+SRCS+= archive.c archive64.c archures.c bfd.c bfdwin.c binary.c cache.c \
coffgen.c corefile.c elf.c elf-eh-frame.c elf-strtab.c format.c \
hash.c ihex.c init.c libbfd.c linker.c merge.c opncls.c reloc.c \
section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \
@@ -49,13 +49,13 @@
# XXX:DEO should grab BFD_VERSION_DATE from ${VERSION}...
bfdver.h: Makefile
- echo '#define BFD_VERSION 214920000' > ${.TARGET}
- echo '#define BFD_VERSION_DATE 20040510' >> ${.TARGET}
+ echo '#define BFD_VERSION 215000000' > ${.TARGET}
+ echo '#define BFD_VERSION_DATE 20040517' >> ${.TARGET}
echo '#define BFD_VERSION_STRING ${VERSION}' >> ${.TARGET}
targmatch.h: targmatch.sed config.bfd
sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}
-
+
config.h: config.h.fbsd
.if ${TARGET_ARCH} == "i386"
sed -e 's,!!TRAD_HEADER!!,"hosts/i386bsd.h",g' ${.ALLSRC} > ${.TARGET}
@@ -63,4 +63,10 @@
sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET}
.endif
+elf32-target.h: elfxx-target.h
+ sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
+
+elf64-target.h: elfxx-target.h
+ sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
+
.include <bsd.lib.mk>
==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.alpha#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.alpha,v 1.11 2004/06/16 07:09:38 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.alpha,v 1.12 2004/06/19 20:37:38 marcel Exp $
DEFAULT_VECTOR= bfd_elf64_alpha_freebsd_vec
@@ -10,5 +10,3 @@
.endif
CLEANFILES+= elf64-target.h
-elf64-target.h: elfxx-target.h
- sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.amd64#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.2 2003/07/01 17:29:48 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.3 2004/06/19 20:37:38 marcel Exp $
.include "${.CURDIR}/Makefile.i386"
@@ -13,9 +13,6 @@
CLEANFILES+= elf64-target.h
-elf64-target.h: elfxx-target.h
- sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
-
CLEANFILES+= elf64-amd64-fbsd.c
elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c
==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.i386#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.15 2004/06/16 07:09:38 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.16 2004/06/19 20:37:38 marcel Exp $
DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec
@@ -14,5 +14,3 @@
.endif
CLEANFILES+= elf32-target.h
-elf32-target.h: elfxx-target.h
- sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.ia64#3 (text+ko) ====
@@ -1,10 +1,9 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.ia64,v 1.6 2002/12/05 18:27:22 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.ia64,v 1.8 2004/06/19 21:14:10 marcel Exp $
DEFAULT_VECTOR= bfd_elf64_ia64_little_vec
SRCS+= cofflink.c cpu-ia64.c efi-app-ia64.c elf32.c elf32-gen.c elf64.c \
elf64-gen.c elf64-ia64.c elflink.c
-#SRCS+= coff-ia64.c elf32-ia64.c
VECS+= ${DEFAULT_VECTOR} \
bfd_efi_app_ia64_vec \
@@ -20,14 +19,8 @@
SRCS+= ${GENSRCS}
CLEANFILES+= ${GENSRCS}
-elf32-target.h: elfxx-target.h
- sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
-
-elf64-target.h: elfxx-target.h
- sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
-
-elf64-ia64.c: elfxx-ia64.c
- sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
+elf64-ia64.c: elfxx-ia64.c elf-fbsd-brand.c
+ cat ${.ALLSRC} | sed -e s/NN/64/g > ${.TARGET}
pepigen.c: peXXigen.c
sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET}
==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.6 2002/12/02 09:59:05 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.7 2004/06/19 20:37:38 marcel Exp $
DEFAULT_VECTOR= bfd_elf32_powerpc_vec
@@ -21,5 +21,3 @@
.endif
CLEANFILES+= elf32-target.h
-elf32-target.h: elfxx-target.h
- sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile.sparc64#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.8 2004/06/17 16:08:20 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.sparc64,v 1.9 2004/06/19 20:37:38 marcel Exp $
DEFAULT_VECTOR= bfd_elf64_sparc_vec
@@ -20,11 +20,6 @@
.endif
CLEANFILES+= elf32-target.h elf64-target.h
-elf32-target.h: elfxx-target.h
- sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
-
-elf64-target.h: elfxx-target.h
- sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
CLEANFILES+= elf64-sparc%FIXED.c
elf64-sparc%FIXED.c: elf64-sparc.c elf64-sparc.c-bad-rtld.diff
==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/config.h.fbsd#5 (text+ko) ====
@@ -1,7 +1,7 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/config.h.fbsd,v 1.5 2002/12/02 09:54:40 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/config.h.fbsd,v 1.6 2004/06/19 19:25:33 marcel Exp $ */
/* config.h. Generated automatically by configure. */
-/* config.in. Generated automatically from configure.in by autoheader 2.13. */
+/* config.in. Generated automatically from configure.in by autoheader. */
/* Define if using alloca.c. */
/* #undef C_ALLOCA */
@@ -28,9 +28,6 @@
/* Define to `long' if <sys/types.h> doesn't define. */
/* #undef off_t */
-/* Define if you need to in order for stat and other things to work. */
-/* #undef _POSIX_SOURCE */
-
/* Define to `unsigned' if <sys/types.h> doesn't define. */
/* #undef size_t */
@@ -67,6 +64,18 @@
/* Define if you have the fdopen function. */
#define HAVE_FDOPEN 1
+/* Define if you have the fseeko function. */
+#define HAVE_FSEEKO 1
+
+/* Define if you have the fseeko64 function. */
+/* #undef HAVE_FSEEKO64 */
+
+/* Define if you have the ftello function. */
+#define HAVE_FTELLO 1
+
+/* Define if you have the ftello64 function. */
+/* #undef HAVE_FTELLO64 */
+
/* Define if you have the getcwd function. */
#define HAVE_GETCWD 1
@@ -109,6 +118,9 @@
/* Define if you have the strchr function. */
#define HAVE_STRCHR 1
+/* Define if you have the strtoull function. */
+#define HAVE_STRTOULL 1
+
/* Define if you have the sysconf function. */
#define HAVE_SYSCONF 1
@@ -179,7 +191,7 @@
#define PACKAGE "bfd"
/* Version number of package */
-/* #define VERSION "2.13.2" */
+/* #define VERSION "2.15" */
/* Define if you have the stpcpy function */
#define HAVE_STPCPY 1
@@ -193,6 +205,12 @@
/* Define as 1 if you have gettext and don't want to use GNU gettext. */
/* #undef HAVE_GETTEXT */
+/* The number of bytes in type long long */
+/* #define SIZEOF_LONG_LONG 8 */
+
+/* The number of bytes in type long */
+/* #define SIZEOF_LONG 8 */
+
/* Use b modifier when opening binary files? */
/* #undef USE_BINARY_FOPEN */
@@ -265,6 +283,9 @@
/* Name of host specific header file to include in trad-core.c. */
#define TRAD_HEADER !!TRAD_HEADER!!
+/* The number of bytes in type off_t */
+/* #define SIZEOF_OFF_T 8 */
+
/* Use mmap if it's available? */
/* #undef USE_MMAP */
==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/ia64/bfd.h#4 (text+ko) ====
@@ -1,15 +1,17 @@
-/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/ia64/bfd.h,v 1.6 2002/12/02 09:49:57 obrien Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/ia64/bfd.h,v 1.7 2004/06/19 18:52:31 marcel Exp $ */
/* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically
generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c",
- "section.c", "archures.c", "reloc.c", "syms.c", "bfd.c", "archive.c",
- "corefile.c", "targets.c" and "format.c".
+ "bfdio.c", "bfdwin.c", "section.c", "archures.c", "reloc.c",
+ "syms.c", "bfd.c", "archive.c", "corefile.c", "targets.c", "format.c",
+ "linker.c" and "simple.c".
Run "make headers" in your build bfd/ to regenerate. */
/* Main header file for the bfd library -- portable access to object files.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- 2000, 2001, 2002
- Free Software Foundation, Inc.
+
+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+ 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
Contributed by Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
@@ -49,10 +51,6 @@
#endif
#endif
-/* #define BFD_VERSION 213010000 */
-/* #define BFD_VERSION_DATE 20021127 */
-/* #define BFD_VERSION_STRING "2.13.2 20021127" */
-
/* The word size used by BFD on the host. This may be 64 with a 32
bit target if the host is 64 bit, or if other 64 bit targets have
been selected with --enable-targets, or if --enable-64-bit-bfd. */
@@ -61,14 +59,13 @@
/* The word size of the default bfd target. */
#define BFD_DEFAULT_TARGET_SIZE 64
-#if defined(__i386__) || defined(__powerpc__)
-#define BFD_HOST_64BIT_LONG 0
-#else
#define BFD_HOST_64BIT_LONG 1
-#endif /* 32-bit host */
-#if 0
-#define BFD_HOST_64_BIT
-#define BFD_HOST_U_64_BIT
+#define BFD_HOST_LONG_LONG 1
+#if 1
+#define BFD_HOST_64_BIT long
+#define BFD_HOST_U_64_BIT unsigned long
+typedef BFD_HOST_64_BIT bfd_int64_t;
+typedef BFD_HOST_U_64_BIT bfd_uint64_t;
#endif
#if BFD_ARCH_SIZE >= 64
@@ -84,65 +81,30 @@
#endif
/* Forward declaration. */
-typedef struct _bfd bfd;
+typedef struct bfd bfd;
+
+/* Boolean type used in bfd. Too many systems define their own
+ versions of "boolean" for us to safely typedef a "boolean" of
+ our own. Using an enum for "bfd_boolean" has its own set of
+ problems, with strange looking casts required to avoid warnings
+ on some older compilers. Thus we just use an int.
-/* To squelch erroneous compiler warnings ("illegal pointer
- combination") from the SVR3 compiler, we would like to typedef
- boolean to int (it doesn't like functions which return boolean.
- Making sure they are never implicitly declared to return int
- doesn't seem to help). But this file is not configured based on
- the host. */
-/* General rules: functions which are boolean return true on success
- and false on failure (unless they're a predicate). -- bfd.doc */
-/* I'm sure this is going to break something and someone is going to
- force me to change it. */
-/* typedef enum boolean {false, true} boolean; */
-/* Yup, SVR4 has a "typedef enum boolean" in <sys/types.h> -fnf */
-/* It gets worse if the host also defines a true/false enum... -sts */
-/* And even worse if your compiler has built-in boolean types... -law */
-/* And even worse if your compiler provides a stdbool.h that conflicts
- with these definitions... gcc 2.95 and later do. If so, it must
- be included first. -drow */
-#if defined (__GNUG__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
-#define TRUE_FALSE_ALREADY_DEFINED
-#else
-#if defined (__bool_true_false_are_defined)
-/* We have <stdbool.h>. */
-#define TRUE_FALSE_ALREADY_DEFINED
-#endif
-#endif
-#ifdef MPW
-/* Pre-emptive strike - get the file with the enum. */
-#include <Types.h>
-#define TRUE_FALSE_ALREADY_DEFINED
-#endif /* MPW */
-#ifndef TRUE_FALSE_ALREADY_DEFINED
-typedef enum bfd_boolean {false, true} boolean;
-#define BFD_TRUE_FALSE
-#else
-/* Use enum names that will appear nowhere else. */
-typedef enum bfd_boolean {bfd_fffalse, bfd_tttrue} boolean;
-#endif
+ General rule: Functions which are bfd_boolean return TRUE on
+ success and FALSE on failure (unless they're a predicate). */
-/* Support for different sizes of target format ints and addresses.
- If the type `long' is at least 64 bits, BFD_HOST_64BIT_LONG will be
- set to 1 above. Otherwise, if gcc is being used, this code will
- use gcc's "long long" type. Otherwise, BFD_HOST_64_BIT must be
- defined above. */
+typedef int bfd_boolean;
+#undef FALSE
+#undef TRUE
+#define FALSE 0
+#define TRUE 1
-#ifndef BFD_HOST_64_BIT
-# if BFD_HOST_64BIT_LONG
-# define BFD_HOST_64_BIT long
-# define BFD_HOST_U_64_BIT unsigned long
-# else
-# ifdef __GNUC__
-# if __GNUC__ >= 2
-# define BFD_HOST_64_BIT long long
-# define BFD_HOST_U_64_BIT unsigned long long
-# endif /* __GNUC__ >= 2 */
-# endif /* ! defined (__GNUC__) */
-# endif /* ! BFD_HOST_64BIT_LONG */
-#endif /* ! defined (BFD_HOST_64_BIT) */
+#if 0
+/* Poison. */
+#undef false
+#undef true
+#define false dont_use_false_in_bfd
+#define true dont_use_true_in_bfd
+#endif
#ifdef BFD64
@@ -191,19 +153,22 @@
#endif /* not BFD64 */
-/* A pointer to a position in a file. */
-/* FIXME: This should be using off_t from <sys/types.h>.
- For now, try to avoid breaking stuff by not including <sys/types.h> here.
- This will break on systems with 64-bit file offsets (e.g. 4.4BSD).
- Probably the best long-term answer is to avoid using file_ptr AND off_t
- in this header file, and to handle this in the BFD implementation
- rather than in its interface. */
-/* typedef off_t file_ptr; */
-typedef bfd_signed_vma file_ptr;
-typedef bfd_vma ufile_ptr;
+#ifndef BFD_HOST_64_BIT
+/* Fall back on a 32 bit type. The idea is to make these types always
+ available for function return types, but in the case that
+ BFD_HOST_64_BIT is undefined such a function should abort or
+ otherwise signal an error. */
+typedef bfd_signed_vma bfd_int64_t;
+typedef bfd_vma bfd_uint64_t;
+#endif
+
+/* An offset into a file. BFD always uses the largest possible offset
+ based on the build time availability of fseek, fseeko, or fseeko64. */
+typedef BFD_HOST_64_BIT file_ptr;
+typedef unsigned BFD_HOST_64_BIT ufile_ptr;
-extern void bfd_sprintf_vma PARAMS ((bfd *, char *, bfd_vma));
-extern void bfd_fprintf_vma PARAMS ((bfd *, PTR, bfd_vma));
+extern void bfd_sprintf_vma (bfd *, char *, bfd_vma);
+extern void bfd_fprintf_vma (bfd *, void *, bfd_vma);
#define printf_vma(x) fprintf_vma(stdout,x)
#define bfd_printf_vma(abfd,x) bfd_fprintf_vma (abfd,stdout,x)
@@ -216,7 +181,7 @@
typedef enum bfd_format
{
bfd_unknown = 0, /* File format is unknown. */
- bfd_object, /* Linker/assember/compiler output. */
+ bfd_object, /* Linker/assembler/compiler output. */
bfd_archive, /* Object archive file. */
bfd_core, /* Core dump. */
bfd_type_end /* Marks the end; don't use it! */
@@ -279,6 +244,9 @@
/* This flag indicates that the BFD contents are actually cached in
memory. If this is set, iostream points to a bfd_in_memory struct. */
#define BFD_IN_MEMORY 0x800
+
+/* The sections in this BFD specify a memory page. */
+#define HAS_LOAD_PAGE 0x1000
/* Symbols and relocation. */
@@ -331,7 +299,7 @@
unsigned int line_number; /* Linenumber from start of function. */
union
{
- struct symbol_cache_entry *sym; /* Function name. */
+ struct bfd_symbol *sym; /* Function name. */
bfd_vma offset; /* Offset into section. */
} u;
}
@@ -342,7 +310,7 @@
#define align_power(addr, align) \
(((addr) + ((bfd_vma) 1 << (align)) - 1) & ((bfd_vma) -1 << (align)))
-typedef struct sec *sec_ptr;
+typedef struct bfd_section *sec_ptr;
#define bfd_get_section_name(bfd, ptr) ((ptr)->name + 0)
#define bfd_get_section_vma(bfd, ptr) ((ptr)->vma + 0)
@@ -358,9 +326,9 @@
#define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = (unsigned int)true), true)
-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),true)
-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),true)
+#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma = (val)), ((ptr)->user_set_vma = TRUE), TRUE)
+#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),TRUE)
+#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),TRUE)
typedef struct stat stat_type;
@@ -386,7 +354,7 @@
/* Get the name of a stabs type code. */
-extern const char *bfd_get_stab_name PARAMS ((int));
+extern const char *bfd_get_stab_name (int);
/* Hash table routines. There is no way to free up a hash table. */
@@ -419,75 +387,74 @@
built each of which calls the function in the superclass. Thus
each function should be written to allocate a new block of memory
only if the argument is NULL. */
- struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
- struct bfd_hash_table *,
- const char *));
+ struct bfd_hash_entry *(*newfunc)
+ (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
/* An objalloc for this hash table. This is a struct objalloc *,
- but we use PTR to avoid requiring the inclusion of objalloc.h. */
- PTR memory;
+ but we use void * to avoid requiring the inclusion of objalloc.h. */
+ void *memory;
};
/* Initialize a hash table. */
-extern boolean bfd_hash_table_init
- PARAMS ((struct bfd_hash_table *,
- struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
- struct bfd_hash_table *,
- const char *)));
+extern bfd_boolean bfd_hash_table_init
+ (struct bfd_hash_table *,
+ struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+ struct bfd_hash_table *,
+ const char *));
/* Initialize a hash table specifying a size. */
-extern boolean bfd_hash_table_init_n
- PARAMS ((struct bfd_hash_table *,
- struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
- struct bfd_hash_table *,
- const char *),
- unsigned int size));
+extern bfd_boolean bfd_hash_table_init_n
+ (struct bfd_hash_table *,
+ struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
+ struct bfd_hash_table *,
+ const char *),
+ unsigned int size);
/* Free up a hash table. */
-extern void bfd_hash_table_free PARAMS ((struct bfd_hash_table *));
+extern void bfd_hash_table_free
+ (struct bfd_hash_table *);
-/* Look up a string in a hash table. If CREATE is true, a new entry
+/* Look up a string in a hash table. If CREATE is TRUE, a new entry
will be created for this string if one does not already exist. The
- COPY argument must be true if this routine should copy the string
+ COPY argument must be TRUE if this routine should copy the string
into newly allocated memory when adding an entry. */
extern struct bfd_hash_entry *bfd_hash_lookup
- PARAMS ((struct bfd_hash_table *, const char *, boolean create,
- boolean copy));
+ (struct bfd_hash_table *, const char *, bfd_boolean create,
+ bfd_boolean copy);
/* Replace an entry in a hash table. */
extern void bfd_hash_replace
- PARAMS ((struct bfd_hash_table *, struct bfd_hash_entry *old,
- struct bfd_hash_entry *nw));
+ (struct bfd_hash_table *, struct bfd_hash_entry *old,
+ struct bfd_hash_entry *nw);
/* Base method for creating a hash table entry. */
extern struct bfd_hash_entry *bfd_hash_newfunc
- PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
- const char *));
+ (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
/* Grab some space for a hash table entry. */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list