From 0d1804061a2c27ffe511a5f9df572ad9748d8219 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 27 Sep 2009 16:26:59 -0700 Subject: Fix IXANY feature macro conditions. --- ChangeLog | 4 ++++ bits/termios.h | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bdc4b4d409..5dcdbfcf01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-09-28 Samuel Thibault + + * bits/termios.h [__USE_UNIX98] (IXANY): Define macro. + 2009-09-20 Andreas Schwab * iconvdata/iso646.c (gconv_init): Correctly initialize the diff --git a/bits/termios.h b/bits/termios.h index 293d0a6061..b697dd19a8 100644 --- a/bits/termios.h +++ b/bits/termios.h @@ -124,8 +124,10 @@ struct termios #define ICRNL (1 << 8) /* Map CR to NL on input. */ #define IXON (1 << 9) /* Enable start/stop output control. */ #define IXOFF (1 << 10) /* Enable start/stop input control. */ -#ifdef __USE_BSD +#if defined __USE_BSD || defined __USE_UNIX98 # define IXANY (1 << 11) /* Any character will restart after stop. */ +#endif +#ifdef __USE_BSD # define IMAXBEL (1 << 13) /* Ring bell when input queue is full. */ #endif #ifdef __USE_GNU -- cgit v1.2.3 From 4fd894620f22dc189d3f8339e39c630c4d05421b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 28 Sep 2009 03:19:58 -0700 Subject: Fix missing reloc dependency When DL_LOOKUP_ADD_DEPENDENCY was introduced a few callers of _dl_lookup_versioned_symbol were not properly adjusted. One of them survived until now. --- ChangeLog | 5 +++++ elf/dl-reloc.c | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dcdbfcf01..db2c0a1ff9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-09-25 Andreas Schwab + + * elf/dl-reloc.c (RESOLVE_MAP): Always pass + DL_LOOKUP_ADD_DEPENDENCY to _dl_lookup_symbol_x. + 2009-09-28 Samuel Thibault * bits/termios.h [__USE_UNIX98] (IXANY): Define macro. diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 680caadd65..6c0069147d 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -254,14 +254,11 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], l->l_lookup_cache.type_class = _tc; \ l->l_lookup_cache.sym = (*ref); \ const struct r_found_version *v = NULL; \ - int flags = DL_LOOKUP_ADD_DEPENDENCY; \ if ((version) != NULL && (version)->hash != 0) \ - { \ - v = (version); \ - flags = 0; \ - } \ + v = (version); \ _lr = _dl_lookup_symbol_x (strtab + (*ref)->st_name, l, (ref), \ - scope, v, _tc, flags, NULL); \ + scope, v, _tc, \ + DL_LOOKUP_ADD_DEPENDENCY, NULL); \ l->l_lookup_cache.ret = (*ref); \ l->l_lookup_cache.value = _lr; })) \ : l) -- cgit v1.2.3 From f450806e22be467a8d613f9a811508ccb87a5d1a Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 28 Sep 2009 04:18:09 -0700 Subject: Handle future binutils versions correctly. --- ChangeLog | 5 +++++ configure | 4 ++-- configure.in | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index db2c0a1ff9..25093e47c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-09-10 H.J. Lu + + * configure.in: Exclude binutils 2.X. Support binutils 2.100 + and XX. + 2009-09-25 Andreas Schwab * elf/dl-reloc.c (RESOLVE_MAP): Always pass diff --git a/configure b/configure index 40121ced34..ce76653821 100755 --- a/configure +++ b/configure @@ -4864,7 +4864,7 @@ $as_echo_n "checking version of $AS... " >&6; } ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*|[3-9].*) + 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; @@ -4927,7 +4927,7 @@ $as_echo_n "checking version of $LD... " >&6; } ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*|3-9.*) + 2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; diff --git a/configure.in b/configure.in index 4a81fb0516..182c683e50 100644 --- a/configure.in +++ b/configure.in @@ -915,10 +915,10 @@ AC_SUBST(MIG)dnl Needed by sysdeps/mach/configure.in # Accept binutils 2.13 or newer. AC_CHECK_PROG_VER(AS, $AS, --version, [GNU assembler.* \([0-9]*\.[0-9.]*\)], - [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*|[3-9].*], AS=: critic_missing="$critic_missing as") + [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as") AC_CHECK_PROG_VER(LD, $LD, --version, [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], - [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9]*]|[3-9].*, LD=: critic_missing="$critic_missing ld") + [2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld") # We need the physical current working directory. We cannot use the # "pwd -P" shell builtin since that's not portable. Instead we try to -- cgit v1.2.3