PERFORCE change 51216 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Apr 16 21:09:24 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=51216
Change 51216 by marcel at marcel_nfs on 2004/04/16 21:09:15
o Adjust to contrib/gdb6.
o Update i386-intree-freebsd for 6.1.
Affected files ...
.. //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc0#4 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/Makefile#7 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/i386/bfd.h#2 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/i386/config.h#2 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#14 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/i386/config.h#2 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/i386/config.h#2 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/i386/config.h#2 edit
Differences ...
==== //depot/projects/gdb/gnu/usr.bin/gdb/Makefile.inc0#4 (text+ko) ====
@@ -4,15 +4,9 @@
# use the normal "Makefile.inc" mechanism, because we need some of these
# definitions before the sub-Makefile is processed.
-VERSION= "6.0.99 [FreeBSD] 2004-01-12"
-
TARGET_ARCH?= ${MACHINE_ARCH}
TARGET_SUBDIR= ${.CURDIR}/${TARGET_ARCH}
CNTRB_ROOT= ${.CURDIR}/../../../../contrib
-CNTRB_BINUTILS= ${CNTRB_ROOT}/binutils
-CNTRB_GDB= ${CNTRB_ROOT}/gdb
-
-GNUBIN_ROOT= ${.CURDIR}/../..
-GNUBIN_BINUTILS= ${GNUBIN_ROOT}/binutils
+CNTRB_GDB= ${CNTRB_ROOT}/gdb6
==== //depot/projects/gdb/gnu/usr.bin/gdb/bfd/Makefile#7 (text+ko) ====
@@ -25,9 +25,10 @@
CFLAGS+= -I${CNTRB_GDB}/include
bfdver.h:
- echo '#define BFD_VERSION_DATE 20040323' > ${.TARGET}
- echo '#define BFD_VERSION 2004032300000000' >> ${.TARGET}
- echo '#define BFD_VERSION_STRING "20040323 20040323"' >> ${.TARGET}
+ echo '#define BFD_VERSION_DATE 20040301' > ${.TARGET}
+ echo '#define BFD_VERSION 601001300' >> ${.TARGET}
+ echo '#define BFD_VERSION_STRING "6.1.0.90_20040413 20040301"' \
+ >> ${.TARGET}
elf32-target.h:
sed -e s/NN/32/g < ${CNTRB_GDB}/bfd/elfxx-target.h > ${.TARGET}
==== //depot/projects/gdb/gnu/usr.bin/gdb/bfd/i386/bfd.h#2 (text+ko) ====
@@ -62,8 +62,6 @@
#if 1
#define BFD_HOST_64_BIT long long
#define BFD_HOST_U_64_BIT unsigned long long
-typedef BFD_HOST_64_BIT bfd_int64_t;
-typedef BFD_HOST_U_64_BIT bfd_uint64_t;
#endif
#if BFD_ARCH_SIZE >= 64
@@ -104,6 +102,24 @@
#define true dont_use_true_in_bfd
#endif
+/* 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 the host compiler used during
+ configuration supports long long, this code will use it.
+ Otherwise, BFD_HOST_64_BIT must be defined above. */
+
+#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
+# if BFD_HOST_LONG_LONG
+# define BFD_HOST_64_BIT long long
+# define BFD_HOST_U_64_BIT unsigned long long
+# endif /* ! BFD_HOST_LONG_LONG */
+# endif /* ! BFD_HOST_64BIT_LONG */
+#endif /* ! defined (BFD_HOST_64_BIT) */
+
#ifdef BFD64
#ifndef BFD_HOST_64_BIT
@@ -151,15 +167,6 @@
#endif /* not BFD64 */
-#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;
@@ -518,29 +525,29 @@
/* Byte swapping routines. */
-bfd_uint64_t bfd_getb64 (const void *);
-bfd_uint64_t bfd_getl64 (const void *);
-bfd_int64_t bfd_getb_signed_64 (const void *);
-bfd_int64_t bfd_getl_signed_64 (const void *);
-bfd_vma bfd_getb32 (const void *);
-bfd_vma bfd_getl32 (const void *);
-bfd_signed_vma bfd_getb_signed_32 (const void *);
-bfd_signed_vma bfd_getl_signed_32 (const void *);
-bfd_vma bfd_getb16 (const void *);
-bfd_vma bfd_getl16 (const void *);
-bfd_signed_vma bfd_getb_signed_16 (const void *);
-bfd_signed_vma bfd_getl_signed_16 (const void *);
-void bfd_putb64 (bfd_uint64_t, void *);
-void bfd_putl64 (bfd_uint64_t, void *);
-void bfd_putb32 (bfd_vma, void *);
-void bfd_putl32 (bfd_vma, void *);
-void bfd_putb16 (bfd_vma, void *);
-void bfd_putl16 (bfd_vma, void *);
+bfd_vma bfd_getb64 (const unsigned char *);
+bfd_vma bfd_getl64 (const unsigned char *);
+bfd_signed_vma bfd_getb_signed_64 (const unsigned char *);
+bfd_signed_vma bfd_getl_signed_64 (const unsigned char *);
+bfd_vma bfd_getb32 (const unsigned char *);
+bfd_vma bfd_getl32 (const unsigned char *);
+bfd_signed_vma bfd_getb_signed_32 (const unsigned char *);
+bfd_signed_vma bfd_getl_signed_32 (const unsigned char *);
+bfd_vma bfd_getb16 (const unsigned char *);
+bfd_vma bfd_getl16 (const unsigned char *);
+bfd_signed_vma bfd_getb_signed_16 (const unsigned char *);
+bfd_signed_vma bfd_getl_signed_16 (const unsigned char *);
+void bfd_putb64 (bfd_vma, unsigned char *);
+void bfd_putl64 (bfd_vma, unsigned char *);
+void bfd_putb32 (bfd_vma, unsigned char *);
+void bfd_putl32 (bfd_vma, unsigned char *);
+void bfd_putb16 (bfd_vma, unsigned char *);
+void bfd_putl16 (bfd_vma, unsigned char *);
/* Byte swapping routines which take size and endiannes as arguments. */
-bfd_uint64_t bfd_get_bits (const void *, int, bfd_boolean);
-void bfd_put_bits (bfd_uint64_t, void *, int, bfd_boolean);
+bfd_vma bfd_get_bits (bfd_byte *, int, bfd_boolean);
+void bfd_put_bits (bfd_vma, bfd_byte *, int, bfd_boolean);
/* Externally visible ECOFF routines. */
@@ -606,12 +613,6 @@
const char *name;
};
-enum dynamic_lib_link_class {
- DYN_NORMAL = 0,
- DYN_AS_NEEDED = 1,
- DYN_DT_NEEDED = 2
-};
-
extern bfd_boolean bfd_elf_record_link_assignment
(bfd *, struct bfd_link_info *, const char *, bfd_boolean);
extern struct bfd_link_needed_list *bfd_elf_get_needed_list
@@ -626,10 +627,10 @@
struct bfd_link_info *, struct bfd_section **, struct bfd_elf_version_tree *);
extern void bfd_elf_set_dt_needed_name
(bfd *, const char *);
+extern void bfd_elf_set_dt_needed_soname
+ (bfd *, const char *);
extern const char *bfd_elf_get_dt_soname
(bfd *);
-extern void bfd_elf_set_dyn_lib_class
- (bfd *, int);
extern struct bfd_link_needed_list *bfd_elf_get_runpath_list
(bfd *, struct bfd_link_info *);
extern bfd_boolean bfd_elf32_discard_info
@@ -872,7 +873,7 @@
/* Byte swapping macros for user section data. */
#define bfd_put_8(abfd, val, ptr) \
- ((void) (*((unsigned char *) (ptr)) = (val) & 0xff))
+ ((void) (*((unsigned char *) (ptr)) = (unsigned char) (val)))
#define bfd_put_signed_8 \
bfd_put_8
#define bfd_get_8(abfd, ptr) \
@@ -960,24 +961,52 @@
#define bfd_h_get_signed_64(abfd, ptr) \
BFD_SEND (abfd, bfd_h_getx_signed_64, (ptr))
-/* Aliases for the above, which should eventually go away. */
+/* Refinements on the above, which should eventually go away. Save
+ cluttering the source with (bfd_vma) and (bfd_byte *) casts. */
+
+#define H_PUT_64(abfd, val, where) \
+ bfd_h_put_64 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_32(abfd, val, where) \
+ bfd_h_put_32 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_16(abfd, val, where) \
+ bfd_h_put_16 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_8 bfd_h_put_8
+
+#define H_PUT_S64(abfd, val, where) \
+ bfd_h_put_signed_64 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_S32(abfd, val, where) \
+ bfd_h_put_signed_32 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_S16(abfd, val, where) \
+ bfd_h_put_signed_16 ((abfd), (bfd_vma) (val), (bfd_byte *) (where))
+
+#define H_PUT_S8 bfd_h_put_signed_8
+
+#define H_GET_64(abfd, where) \
+ bfd_h_get_64 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_32(abfd, where) \
+ bfd_h_get_32 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_16(abfd, where) \
+ bfd_h_get_16 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_8 bfd_h_get_8
+
+#define H_GET_S64(abfd, where) \
+ bfd_h_get_signed_64 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_S32(abfd, where) \
+ bfd_h_get_signed_32 ((abfd), (bfd_byte *) (where))
+
+#define H_GET_S16(abfd, where) \
+ bfd_h_get_signed_16 ((abfd), (bfd_byte *) (where))
-#define H_PUT_64 bfd_h_put_64
-#define H_PUT_32 bfd_h_put_32
-#define H_PUT_16 bfd_h_put_16
-#define H_PUT_8 bfd_h_put_8
-#define H_PUT_S64 bfd_h_put_signed_64
-#define H_PUT_S32 bfd_h_put_signed_32
-#define H_PUT_S16 bfd_h_put_signed_16
-#define H_PUT_S8 bfd_h_put_signed_8
-#define H_GET_64 bfd_h_get_64
-#define H_GET_32 bfd_h_get_32
-#define H_GET_16 bfd_h_get_16
-#define H_GET_8 bfd_h_get_8
-#define H_GET_S64 bfd_h_get_signed_64
-#define H_GET_S32 bfd_h_get_signed_32
-#define H_GET_S16 bfd_h_get_signed_16
-#define H_GET_S8 bfd_h_get_signed_8
+#define H_GET_S8 bfd_h_get_signed_8
/* Extracted from bfdio.c. */
@@ -1633,7 +1662,6 @@
#define bfd_mach_sh3e 0x3e
#define bfd_mach_sh4 0x40
#define bfd_mach_sh4_nofpu 0x41
-#define bfd_mach_sh4_nommu_nofpu 0x42
#define bfd_mach_sh4a 0x4a
#define bfd_mach_sh4a_nofpu 0x4b
#define bfd_mach_sh4al_dsp 0x4d
@@ -1689,7 +1717,6 @@
#define bfd_mach_frvsimple 2
#define bfd_mach_fr300 300
#define bfd_mach_fr400 400
-#define bfd_mach_fr450 450
#define bfd_mach_frvtomcat 499 /* fr500 prototype */
#define bfd_mach_fr500 500
#define bfd_mach_fr550 550
@@ -4101,26 +4128,26 @@
/* Entries for byte swapping for data. These are different from the
other entry points, since they don't take a BFD asthe first argument.
Certain other handlers could do the same. */
- bfd_uint64_t (*bfd_getx64) (const void *);
- bfd_int64_t (*bfd_getx_signed_64) (const void *);
- void (*bfd_putx64) (bfd_uint64_t, void *);
- bfd_vma (*bfd_getx32) (const void *);
- bfd_signed_vma (*bfd_getx_signed_32) (const void *);
- void (*bfd_putx32) (bfd_vma, void *);
- bfd_vma (*bfd_getx16) (const void *);
- bfd_signed_vma (*bfd_getx_signed_16) (const void *);
- void (*bfd_putx16) (bfd_vma, void *);
+ bfd_vma (*bfd_getx64) (const bfd_byte *);
+ bfd_signed_vma (*bfd_getx_signed_64) (const bfd_byte *);
+ void (*bfd_putx64) (bfd_vma, bfd_byte *);
+ bfd_vma (*bfd_getx32) (const bfd_byte *);
+ bfd_signed_vma (*bfd_getx_signed_32) (const bfd_byte *);
+ void (*bfd_putx32) (bfd_vma, bfd_byte *);
+ bfd_vma (*bfd_getx16) (const bfd_byte *);
+ bfd_signed_vma (*bfd_getx_signed_16) (const bfd_byte *);
+ void (*bfd_putx16) (bfd_vma, bfd_byte *);
/* Byte swapping for the headers. */
- bfd_uint64_t (*bfd_h_getx64) (const void *);
- bfd_int64_t (*bfd_h_getx_signed_64) (const void *);
- void (*bfd_h_putx64) (bfd_uint64_t, void *);
- bfd_vma (*bfd_h_getx32) (const void *);
- bfd_signed_vma (*bfd_h_getx_signed_32) (const void *);
- void (*bfd_h_putx32) (bfd_vma, void *);
- bfd_vma (*bfd_h_getx16) (const void *);
- bfd_signed_vma (*bfd_h_getx_signed_16) (const void *);
- void (*bfd_h_putx16) (bfd_vma, void *);
+ bfd_vma (*bfd_h_getx64) (const bfd_byte *);
+ bfd_signed_vma (*bfd_h_getx_signed_64) (const bfd_byte *);
+ void (*bfd_h_putx64) (bfd_vma, bfd_byte *);
+ bfd_vma (*bfd_h_getx32) (const bfd_byte *);
+ bfd_signed_vma (*bfd_h_getx_signed_32) (const bfd_byte *);
+ void (*bfd_h_putx32) (bfd_vma, bfd_byte *);
+ bfd_vma (*bfd_h_getx16) (const bfd_byte *);
+ bfd_signed_vma (*bfd_h_getx_signed_16) (const bfd_byte *);
+ void (*bfd_h_putx16) (bfd_vma, bfd_byte *);
/* Format dependent routines: these are vectors of entry points
within the target vector structure, one for each format to check. */
==== //depot/projects/gdb/gnu/usr.bin/gdb/bfd/i386/config.h#2 (text+ko) ====
@@ -173,15 +173,9 @@
/* Define if you have the <sys/procfs.h> header file. */
#define HAVE_SYS_PROCFS_H 1
-/* Define if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
/* Define if you have the <sys/time.h> header file. */
#define HAVE_SYS_TIME_H 1
-/* Define if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
/* Define if you have the <time.h> header file. */
#define HAVE_TIME_H 1
@@ -195,7 +189,7 @@
#define PACKAGE "bfd"
/* Version number of package */
-#define VERSION "20040323"
+#define VERSION "6.1.0.90_20040413"
/* Define if you have the stpcpy function */
#define HAVE_STPCPY 1
==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/Makefile#14 (text+ko) ====
@@ -5,7 +5,8 @@
.PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi \
${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR}
-PROG= gdb
+PROG= gdb6
+NOMAN= yes
GENSRCS=version.c nm.h tm.h
SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c bcache.c \
bfd-target.c block.c blockframe.c breakpoint.c buildsym.c \
@@ -63,6 +64,8 @@
DPADD= ${GDB_LIBS} ${LIBREADLINE} ${LIBM}
LDADD= ${GDB_LIBS} -lreadline -lm
+VERSION= "6.1.0.90_20040413 [FreeBSD]"
+
version.c:
echo '#include "version.h"' > ${.TARGET}
echo 'const char version[] = ${VERSION};' >> ${.TARGET}
==== //depot/projects/gdb/gnu/usr.bin/gdb/gdb/i386/config.h#2 (text+ko) ====
@@ -137,15 +137,6 @@
/* Define if you have HPUX threads */
/* #undef HAVE_HPUX_THREAD_SUPPORT */
-/* Define if you want to use the memory mapped malloc package (mmalloc). */
-/* #undef USE_MMALLOC */
-
-/* Define if the runtime uses a routine from mmalloc before gdb has a chance
- to initialize mmalloc, and we want to force checking to be used anyway.
- This may cause spurious memory corruption messages if the runtime tries
- to explicitly deallocate that memory when gdb calls exit. */
-/* #undef MMCHECK_FORCE */
-
/* Define if <proc_service.h> on solaris uses int instead of
size_t, and assorted other type changes. */
/* #undef PROC_SERVICE_IS_OLD */
@@ -400,7 +391,7 @@
#define HAVE_TERMIOS_H 1
/* Define if you have the <thread_db.h> header file. */
-#define HAVE_THREAD_DB_H 1
+/* #undef HAVE_THREAD_DB_H */
/* Define if you have the <time.h> header file. */
#define HAVE_TIME_H 1
@@ -439,7 +430,7 @@
#define PACKAGE "gdb"
/* Global directory for separate debug files. */
-#define DEBUGDIR "/usr/lib/debug"
+#define DEBUGDIR "/usr/local/lib/debug"
/* Define to BFD's default architecture. */
#define DEFAULT_BFD_ARCH bfd_i386_arch
==== //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/i386/config.h#2 (text+ko) ====
@@ -1,5 +1,8 @@
/* config.h. Generated by configure. */
/* config.in. Generated from configure.ac by autoheader. */
+/* Define to `unsigned long' if <sys/types.h> doesn't define. */
+/* #undef uintptr_t */
+
/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
#define BYTEORDER 1234
@@ -360,11 +363,9 @@
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+ if it is not supported. */
/* #undef inline */
-#endif
/* Define to `int' if <sys/types.h> does not define. */
/* #undef pid_t */
==== //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/i386/config.h#2 (text+ko) ====
@@ -107,12 +107,6 @@
/* Define if you have the <sys/param.h> header file. */
#define HAVE_SYS_PARAM_H 1
-/* Define if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
/* Define if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
@@ -123,7 +117,7 @@
#define PACKAGE "opcodes"
/* Version number of package */
-#define VERSION "20040323"
+#define VERSION "6.1.0.90_20040413"
/* Define if you have the stpcpy function */
#define HAVE_STPCPY 1
More information about the p4-projects
mailing list