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.
This commit is contained in:
Roland McGrath 1996-03-28 09:48:58 +00:00
parent 0393dfd6c2
commit ffcf96345f
5 changed files with 21 additions and 9 deletions

View File

@ -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> 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. * locale/programs/xmalloc.c: Test _LIBC as well as STDC_HEADERS.

View File

@ -610,7 +610,8 @@ cd $(@D); $(BUILD_CC) $(BUILD_CFLAGS) $(<:$(common-objpfx)%=%) -o $(@F)
endef endef
# We always want to use configuration definitions. # 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. # Support the GNU standard name for this target.
.PHONY: check .PHONY: check

6
configure vendored
View File

@ -1437,7 +1437,7 @@ else
${libc_cv_asm_global_directive} foo ${libc_cv_asm_global_directive} foo
foo: .long 0 foo: .long 0
.weakext foo .weakext foo
.weak bar, foo .weakext bar, foo
EOF EOF
if ${CC-cc} $CFLAGS -c conftest.s 2>/dev/null; then if ${CC-cc} $CFLAGS -c conftest.s 2>/dev/null; then
libc_cv_asm_weakext_directive=yes libc_cv_asm_weakext_directive=yes
@ -1452,12 +1452,12 @@ echo "$ac_t""$libc_cv_asm_weakext_directive" 1>&4
fi # no .weak fi # no .weak
fi # not ELF fi # not ELF
if test $libc_cv_asm_weak_directive; then if test $libc_cv_asm_weak_directive = yes; then
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_ASM_WEAK_DIRECTIVE 1 #define HAVE_ASM_WEAK_DIRECTIVE 1
EOF EOF
elif test $libc_cv_asm_weakext_directive; then elif test $libc_cv_asm_weakext_directive = yes; then
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_ASM_WEAKEXT_DIRECTIVE 1 #define HAVE_ASM_WEAKEXT_DIRECTIVE 1
EOF EOF

View File

@ -451,7 +451,7 @@ cat > conftest.s <<EOF
${libc_cv_asm_global_directive} foo ${libc_cv_asm_global_directive} foo
foo: .long 0 foo: .long 0
.weakext foo .weakext foo
.weak bar, foo .weakext bar, foo
EOF EOF
if ${CC-cc} $CFLAGS -c conftest.s 2>/dev/null; then if ${CC-cc} $CFLAGS -c conftest.s 2>/dev/null; then
libc_cv_asm_weakext_directive=yes libc_cv_asm_weakext_directive=yes
@ -463,9 +463,9 @@ EOF
fi # no .weak fi # no .weak
fi # not ELF 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) 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) AC_DEFINE(HAVE_ASM_WEAKEXT_DIRECTIVE)
fi fi

View File

@ -1,5 +1,5 @@
/* nl_langinfo -- User interface for extracting locale-dependent parameters. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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 the string for the specified item. */
return (char *) data->strings[index]; return (char *) data->values[index].string;
} }