diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makerules | 3 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | locale/nl_langinfo.c | 4 |
5 files changed, 21 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 2c683f8aed..7dd1a4bd17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Thu Mar 28 03:00:43 1996 Roland McGrath <roland@whiz-bang.gnu.ai.mit.edu> + + * locale/nl_langinfo.c (nl_langinfo): Use DATA->values instead of + DATA->strings. + + * Makerules (BUILD_CFLAGS): Remove $(common-objpfx) from config.h. + + * configure.in (.weakext check): Fix asm code to use .weakext instead + of .weak! Fix bogus test calls. + * configure: Regenerated. + Thu Mar 28 03:25:10 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> * locale/programs/xmalloc.c: Test _LIBC as well as STDC_HEADERS. diff --git a/Makerules b/Makerules index c68395cfd9..296e811432 100644 --- a/Makerules +++ b/Makerules @@ -610,7 +610,8 @@ cd $(@D); $(BUILD_CC) $(BUILD_CFLAGS) $(<:$(common-objpfx)%=%) -o $(@F) endef # We always want to use configuration definitions. -BUILD_CFLAGS = -include $(common-objpfx)config.h +# This is always used in $(common-objdir), so we use no directory name. +BUILD_CFLAGS = -include config.h # Support the GNU standard name for this target. .PHONY: check diff --git a/configure b/configure index 83715cdda7..09dd165c41 100755 --- a/configure +++ b/configure @@ -1437,7 +1437,7 @@ else ${libc_cv_asm_global_directive} foo foo: .long 0 .weakext foo -.weak bar, foo +.weakext bar, foo EOF if ${CC-cc} $CFLAGS -c conftest.s 2>/dev/null; then libc_cv_asm_weakext_directive=yes @@ -1452,12 +1452,12 @@ echo "$ac_t""$libc_cv_asm_weakext_directive" 1>&4 fi # no .weak fi # not ELF -if test $libc_cv_asm_weak_directive; then +if test $libc_cv_asm_weak_directive = yes; then cat >> confdefs.h <<\EOF #define HAVE_ASM_WEAK_DIRECTIVE 1 EOF -elif test $libc_cv_asm_weakext_directive; then +elif test $libc_cv_asm_weakext_directive = yes; then cat >> confdefs.h <<\EOF #define HAVE_ASM_WEAKEXT_DIRECTIVE 1 EOF diff --git a/configure.in b/configure.in index b2727d54f2..734c5ad324 100644 --- a/configure.in +++ b/configure.in @@ -451,7 +451,7 @@ cat > conftest.s <<EOF ${libc_cv_asm_global_directive} foo foo: .long 0 .weakext foo -.weak bar, foo +.weakext bar, foo EOF if ${CC-cc} $CFLAGS -c conftest.s 2>/dev/null; then libc_cv_asm_weakext_directive=yes @@ -463,9 +463,9 @@ EOF fi # no .weak fi # not ELF -if test $libc_cv_asm_weak_directive; then +if test $libc_cv_asm_weak_directive = yes; then AC_DEFINE(HAVE_ASM_WEAK_DIRECTIVE) -elif test $libc_cv_asm_weakext_directive; then +elif test $libc_cv_asm_weakext_directive = yes; then AC_DEFINE(HAVE_ASM_WEAKEXT_DIRECTIVE) fi diff --git a/locale/nl_langinfo.c b/locale/nl_langinfo.c index 83d35dcb70..a9fa4238c2 100644 --- a/locale/nl_langinfo.c +++ b/locale/nl_langinfo.c @@ -1,5 +1,5 @@ /* nl_langinfo -- User interface for extracting locale-dependent parameters. -Copyright (C) 1995 Free Software Foundation, Inc. +Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -62,5 +62,5 @@ nl_langinfo (item) } /* Return the string for the specified item. */ - return (char *) data->strings[index]; + return (char *) data->values[index].string; } |