yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge from gcc

Browse Source
This commit is contained in:
DJ Delorie 2012-04-10 17:07:35 +00:00
parent 9a82b8ff87
commit b3641a6eb9
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-10 Tristan Gingold <gingold@adacore.com>
* splay-tree.h: Conditionnaly includes stdint.h and inttypes.h
(libi_uhostptr_t, libi_shostptr_t): Remove, replaced by uintptr_t.
2012-04-09 Roland McGrath <mcgrathr@google.com> 2012-04-09 Roland McGrath <mcgrathr@google.com>
* bfdlink.h (struct bfd_link_info): Add new member user_phdrs. * bfdlink.h (struct bfd_link_info): Add new member user_phdrs.

19
include/splay-tree.h
View File

@ -37,18 +37,11 @@ extern "C" {
#include "ansidecl.h" #include "ansidecl.h"
#ifndef _WIN64 #ifdef HAVE_STDINT_H
typedef unsigned long int libi_uhostptr_t; #include <stdint.h>
typedef long int libi_shostptr_t;
#else
#ifdef __GNUC__
__extension__
#endif #endif
typedef unsigned long long libi_uhostptr_t; #ifdef HAVE_INTTYPES_H
#ifdef __GNUC__ #include <inttypes.h>
__extension__
#endif
typedef long long libi_shostptr_t;
#endif #endif
#ifndef GTY #ifndef GTY
@ -59,8 +52,8 @@ extern "C" {
these types, if necessary. These types should be sufficiently wide these types, if necessary. These types should be sufficiently wide
that any pointer or scalar can be cast to these types, and then that any pointer or scalar can be cast to these types, and then
cast back, without loss of precision. */ cast back, without loss of precision. */
typedef libi_uhostptr_t splay_tree_key; typedef uintptr_t splay_tree_key;
typedef libi_uhostptr_t splay_tree_value; typedef uintptr_t splay_tree_value;
/* Forward declaration for a node in the tree. */ /* Forward declaration for a node in the tree. */
typedef struct splay_tree_node_s *splay_tree_node; typedef struct splay_tree_node_s *splay_tree_node;

4
libiberty/ChangeLog
View File

@ -1,3 +1,7 @@
2012-04-04 Tristan Gingold <gingold@adacore.com>
* pex-unix.c (to_ptr32): Fix style.
2012-04-02 Tristan Gingold <gingold@adacore.com> 2012-04-02 Tristan Gingold <gingold@adacore.com>
* stack-limit.c: Includes ansidecl.h. * stack-limit.c: Includes ansidecl.h.

6
libiberty/pex-unix.c
View File

@ -85,13 +85,15 @@ to_ptr32 (char **ptr64)
int argc; int argc;
__char_ptr_char_ptr32 short_argv; __char_ptr_char_ptr32 short_argv;
for (argc=0; ptr64[argc]; argc++); /* Count number of arguments. */
for (argc = 0; ptr64[argc] != NULL; argc++)
;
/* Reallocate argv with 32 bit pointers. */ /* Reallocate argv with 32 bit pointers. */
short_argv = (__char_ptr_char_ptr32) decc$malloc short_argv = (__char_ptr_char_ptr32) decc$malloc
(sizeof (__char_ptr32) * (argc + 1)); (sizeof (__char_ptr32) * (argc + 1));
for (argc=0; ptr64[argc]; argc++) for (argc = 0; ptr64[argc] != NULL; argc++)
short_argv[argc] = (__char_ptr32) decc$strdup (ptr64[argc]); short_argv[argc] = (__char_ptr32) decc$strdup (ptr64[argc]);
short_argv[argc] = (__char_ptr32) 0; short_argv[argc] = (__char_ptr32) 0;