PERFORCE change 51230 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Apr 17 00:27:57 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=51230
Change 51230 by marcel at marcel_nfs on 2004/04/17 00:27:31
Update alpha-intree-freebsd to gdb 6.1
Affected files ...
.. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/alpha/bfd.h#2 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/bfd/alpha/config.h#2 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/gdb/alpha/config.h#2 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/alpha/config.h#2 edit
.. //depot/projects/gdb/gnu/usr.bin/gdb/opcodes/alpha/config.h#2 edit
Differences ...
==== //depot/projects/gdb/gnu/usr.bin/gdb/bfd/alpha/bfd.h#2 (text+ko) ====
@@ -59,11 +59,9 @@
#define BFD_HOST_64BIT_LONG 1
#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;
+#if 0
+#define BFD_HOST_64_BIT
+#define BFD_HOST_U_64_BIT
#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/alpha/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/alpha/config.h#2 (text+ko) ====
@@ -169,7 +169,7 @@
/* #undef GDB_XM_FILE */
/* targetfile */
-#define GDB_TM_FILE config/alpha/tm-alpha.h
+#define GDB_TM_FILE config/alpha/tm-fbsd.h
/* nativefile */
#define GDB_NM_FILE config/alpha/nm-fbsd.h
==== //depot/projects/gdb/gnu/usr.bin/gdb/libiberty/alpha/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/alpha/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