Commit 8ada417f by Zack Weinberg Committed by Zack Weinberg

aclocal.m4 (gcc_AC_CHECK_TYPE): Clone of AC_CHECK_TYPE...

	* aclocal.m4 (gcc_AC_CHECK_TYPE): Clone of AC_CHECK_TYPE,
	uses three-argument AC_DEFINE so no acconfig.h entries are
	needed.
	(_gcc_COMPUTE_GAS_VERSION): Also provide gcc_cv_gas_vers
	which contains the GAS version number as a scaled integer.
	(gcc_GAS_VERSION_GTE_IFELSE): Use gcc_cv_gas_vers.  Add
	ability to check for ELF assembler.
	(gcc_GAS_CHECK_FEATURE): New macro.
	* configure.in: Use gcc_AC_CHECK_TYPE.  Rewrite all
	assembler feature checks using gcc_GAS_CHECK_FEATURE.
	Use three-argument AC_DEFINE everywhere.
	* acconfig.h: Deleted.
	* config.in, configure: Regenerate.

From-SVN: r69272
parent d33fb69b
2003-07-12 Zack Weinberg <zack@codesourcery.com>
* aclocal.m4 (gcc_AC_CHECK_TYPE): Clone of AC_CHECK_TYPE,
uses three-argument AC_DEFINE so no acconfig.h entries are
needed.
(_gcc_COMPUTE_GAS_VERSION): Also provide gcc_cv_gas_vers
which contains the GAS version number as a scaled integer.
(gcc_GAS_VERSION_GTE_IFELSE): Use gcc_cv_gas_vers. Add
ability to check for ELF assembler.
(gcc_GAS_CHECK_FEATURE): New macro.
* configure.in: Use gcc_AC_CHECK_TYPE. Rewrite all
assembler feature checks using gcc_GAS_CHECK_FEATURE.
Use three-argument AC_DEFINE everywhere.
* acconfig.h: Deleted.
* config.in, configure: Regenerate.
2003-07-12 Nathanael Nerode <neroden@gcc.gnu.org> 2003-07-12 Nathanael Nerode <neroden@gcc.gnu.org>
* fixinc/inclhack.def (struct_sockaddr): Avoid "fixing" sockaddr_in * fixinc/inclhack.def (struct_sockaddr): Avoid "fixing" sockaddr_in
......
/* Define if your assembler supports specifying the maximum number
of bytes to skip when using the GAS .p2align command. */
#undef HAVE_GAS_MAX_SKIP_P2ALIGN
/* Define if your assembler supports .balign and .p2align. */
#undef HAVE_GAS_BALIGN_AND_P2ALIGN
/* Define if your assembler uses the old HImode fild and fist notation. */
#undef HAVE_GAS_FILDS_FISTS
/* Define to `int' if <sys/types.h> doesn't define. */
#undef ssize_t
/* Define if cpp should also search $prefix/include. */
#undef PREFIX_INCLUDE_DIR
@BOTTOM@
/* Bison unconditionally undefines `const' if neither `__STDC__' nor
__cplusplus are defined. That's a problem since we use `const' in
the GCC headers, and the resulting bison code is therefore type
unsafe. Thus, we must match the bison behavior here. */
#ifndef __STDC__
#ifndef __cplusplus
#undef const
#define const
#endif
#endif
...@@ -16,6 +16,27 @@ if test $ac_cv_header_stdbool_h = yes; then ...@@ -16,6 +16,27 @@ if test $ac_cv_header_stdbool_h = yes; then
fi fi
]) ])
dnl Fixed AC_CHECK_TYPE that doesn't need anything in acconfig.h.
dnl Remove after migrating to 2.5x.
AC_DEFUN(gcc_AC_CHECK_TYPE,
[AC_REQUIRE([AC_HEADER_STDC])dnl
AC_MSG_CHECKING(for $1)
AC_CACHE_VAL(ac_cv_type_$1,
[AC_EGREP_CPP(dnl
changequote(<<,>>)dnl
<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
changequote([,]), [#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#include <stddef.h>
#endif], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
AC_MSG_RESULT($ac_cv_type_$1)
if test $ac_cv_type_$1 = no; then
AC_DEFINE($1, $2, [Define as \`$2' if <sys/types.h> doesn't define.])
fi
])
dnl See whether we can include both string.h and strings.h. dnl See whether we can include both string.h and strings.h.
AC_DEFUN(gcc_AC_HEADER_STRING, AC_DEFUN(gcc_AC_HEADER_STRING,
[AC_CACHE_CHECK([whether string.h and strings.h may both be included], [AC_CACHE_CHECK([whether string.h and strings.h may both be included],
...@@ -659,9 +680,12 @@ done ...@@ -659,9 +680,12 @@ done
gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([[0-9]]*\)"` gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([[0-9]]*\)"`
gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[[0-9]]*\.\([[0-9]]*\)"` gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[[0-9]]*\.\([[0-9]]*\)"`
gcc_cv_gas_patch_version=`expr "$gcc_cv_gas_version" : "VERSION=[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)"` gcc_cv_gas_patch_version=`expr "$gcc_cv_gas_version" : "VERSION=[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)"`
gcc_cv_gas_vers=`expr \( \( $gcc_cv_gas_major_version \* 1000 \) \
+ $gcc_cv_gas_minor_version \) \* 1000 \
+ $gcc_cv_gas_patch_version`
]) []dnl # _gcc_COMPUTE_GAS_VERSION ]) []dnl # _gcc_COMPUTE_GAS_VERSION
dnl # gcc_GAS_VERSION_GTE_IFELSE(major, minor, patchlevel, dnl # gcc_GAS_VERSION_GTE_IFELSE([elf,] major, minor, patchlevel,
dnl # [command_if_true = :], [command_if_false = :]) dnl # [command_if_true = :], [command_if_false = :])
dnl # Check to see if the version of GAS is greater than or dnl # Check to see if the version of GAS is greater than or
dnl # equal to the specified version. dnl # equal to the specified version.
...@@ -670,23 +694,54 @@ dnl # The first ifelse() shortens the shell code if the patchlevel ...@@ -670,23 +694,54 @@ dnl # The first ifelse() shortens the shell code if the patchlevel
dnl # is unimportant (the usual case). The others handle missing dnl # is unimportant (the usual case). The others handle missing
dnl # commands. Note that the tests are structured so that the most dnl # commands. Note that the tests are structured so that the most
dnl # common version number cases are tested first. dnl # common version number cases are tested first.
AC_DEFUN([_gcc_GAS_VERSION_GTE_IFELSE],
[ifelse([$1], elf,
[if test $in_tree_gas_is_elf = yes \
&&],
[if]) test $gcc_cv_gas_vers -ge `expr \( \( $2 \* 1000 \) + $3 \) \* 1000 + $4`
then dnl
ifelse([$5],,:,[$5])[]dnl
ifelse([$6],,,[
else $6])
fi])
AC_DEFUN([gcc_GAS_VERSION_GTE_IFELSE], AC_DEFUN([gcc_GAS_VERSION_GTE_IFELSE],
[AC_REQUIRE([_gcc_COMPUTE_GAS_VERSION]) []dnl [AC_REQUIRE([_gcc_COMPUTE_GAS_VERSION])dnl
ifelse([$3],[0], ifelse([$1], elf, [_gcc_GAS_VERSION_GTE_IFELSE($@)],
[if test $gcc_cv_gas_major_version -eq $1 \ [_gcc_GAS_VERSION_GTE_IFELSE(,$@)])])
&& test $gcc_cv_gas_minor_version -ge $2 \
|| test $gcc_cv_gas_major_version -gt $1 ; then dnl gcc_GAS_CHECK_FEATURE(description, cv, [[elf,]major,minor,patchlevel],
], dnl [extra switches to as], [assembler input],
[if test $gcc_cv_gas_major_version -eq $1 \ dnl [extra testing logic], [command if feature available])
&& (test $gcc_cv_gas_minor_version -gt $2 \ dnl
|| (test $gcc_cv_gas_minor_version -eq $2 \ dnl Checks for an assembler feature. If we are building an in-tree
&& test $gcc_cv_gas_patch_version -ge $3 )) \ dnl gas, the feature is available if the associated assembler version
|| test $gcc_cv_gas_major_version -gt $1 ; then dnl is greater than or equal to major.minor.patchlevel. If not, then
]) dnl ASSEMBLER INPUT is fed to the assembler and the feature is available
ifelse([$4],[],[:],[$4]) dnl if assembly succeeds. If EXTRA TESTING LOGIC is not the empty string,
ifelse([$5],[],[],[else $5]) dnl then it is run instead of simply setting CV to "yes" - it is responsible
fi dnl for doing so, if appropriate.
]) []dnl # gcc_GAS_VERSION_GTE_IFELSE AC_DEFUN([gcc_GAS_CHECK_FEATURE],
[AC_CACHE_CHECK([assembler for $1], [$2],
[[$2]=no
ifelse([$3],,,[dnl
if test $in_tree_gas = yes; then
gcc_GAS_VERSION_GTE_IFELSE($3, [[$2]=yes])
el])if test x$gcc_cv_as != x; then
echo ifelse(substr([$5],0,1),[$], "[$5]", '[$5]') > conftest.s
if AC_TRY_COMMAND([$gcc_cv_as $4 -o conftest.o conftest.s >&AC_FD_CC])
then
ifelse([$6],, [$2]=yes, [$6])
else
echo "configure: failed program was" >&AC_FD_CC
cat conftest.s >&AC_FD_CC
fi
rm -f conftest.o conftest.s
fi])
ifelse([$7],,,[dnl
if test $[$2] = yes; then
$7
fi])])
# lcmessage.m4 serial 3 (gettext-0.11.3) # lcmessage.m4 serial 3 (gettext-0.11.3)
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
......
...@@ -34,22 +34,6 @@ ...@@ -34,22 +34,6 @@
/* Define vfork as fork if vfork does not work. */ /* Define vfork as fork if vfork does not work. */
#undef vfork #undef vfork
/* Define if your assembler supports specifying the maximum number
of bytes to skip when using the GAS .p2align command. */
#undef HAVE_GAS_MAX_SKIP_P2ALIGN
/* Define if your assembler supports .balign and .p2align. */
#undef HAVE_GAS_BALIGN_AND_P2ALIGN
/* Define if your assembler uses the old HImode fild and fist notation. */
#undef HAVE_GAS_FILDS_FISTS
/* Define to `int' if <sys/types.h> doesn't define. */
#undef ssize_t
/* Define if cpp should also search $prefix/include. */
#undef PREFIX_INCLUDE_DIR
/* Define if you have the alphasort function. */ /* Define if you have the alphasort function. */
#undef HAVE_ALPHASORT #undef HAVE_ALPHASORT
...@@ -288,6 +272,9 @@ ...@@ -288,6 +272,9 @@
first argument is NULL. */ first argument is NULL. */
#undef HAVE_WORKING_MBSTOWCS #undef HAVE_WORKING_MBSTOWCS
/* Define as `int' if <sys/types.h> doesn't define. */
#undef ssize_t
/* Define if printf supports %p. */ /* Define if printf supports %p. */
#undef HAVE_PRINTF_PTR #undef HAVE_PRINTF_PTR
...@@ -442,6 +429,13 @@ ...@@ -442,6 +429,13 @@
/* Define to be the last portion of registry key on windows hosts. */ /* Define to be the last portion of registry key on windows hosts. */
#undef WIN32_REGISTRY_KEY #undef WIN32_REGISTRY_KEY
/* Define if your assembler supports .balign and .p2align. */
#undef HAVE_GAS_BALIGN_AND_P2ALIGN
/* Define if your assembler supports specifying the maximum number
of bytes to skip when using the GAS .p2align command. */
#undef HAVE_GAS_MAX_SKIP_P2ALIGN
/* Define if your assembler supports .subsection and .subsection -1 starts /* Define if your assembler supports .subsection and .subsection -1 starts
emitting at the beginning of your section. */ emitting at the beginning of your section. */
#undef HAVE_GAS_SUBSECTION_ORDERING #undef HAVE_GAS_SUBSECTION_ORDERING
...@@ -449,10 +443,10 @@ ...@@ -449,10 +443,10 @@
/* Define if your assembler supports .weak. */ /* Define if your assembler supports .weak. */
#undef HAVE_GAS_WEAK #undef HAVE_GAS_WEAK
/* Define if your assembler supports .hidden. */ /* Define if your assembler and linker support .hidden. */
#undef HAVE_GAS_HIDDEN #undef HAVE_GAS_HIDDEN
/* Define if your assembler supports .uleb128. */ /* Define if your assembler supports .sleb128 and .uleb128. */
#undef HAVE_AS_LEB128 #undef HAVE_AS_LEB128
/* Define if your assembler mis-optimizes .eh_frame data. */ /* Define if your assembler mis-optimizes .eh_frame data. */
...@@ -482,6 +476,9 @@ ...@@ -482,6 +476,9 @@
/* Define if your assembler supports offsetable %lo(). */ /* Define if your assembler supports offsetable %lo(). */
#undef HAVE_AS_OFFSETABLE_LO10 #undef HAVE_AS_OFFSETABLE_LO10
/* Define if your assembler uses the new HImode fild and fist notation. */
#undef HAVE_GAS_FILDS_FISTS
/* Define true if the assembler supports '.long foo@GOTOFF'. */ /* Define true if the assembler supports '.long foo@GOTOFF'. */
#undef HAVE_AS_GOTOFF_IN_DATA #undef HAVE_AS_GOTOFF_IN_DATA
...@@ -498,9 +495,6 @@ ...@@ -498,9 +495,6 @@
/* Define if your assembler supports the --gdwarf2 option. */ /* Define if your assembler supports the --gdwarf2 option. */
#undef HAVE_AS_GDWARF2_DEBUG_FLAG #undef HAVE_AS_GDWARF2_DEBUG_FLAG
/* Define if your assembler supports the --gstabs option. */
#undef HAVE_AS_GSTABS_DEBUG_FLAG
/* Define if your linker links a mix of read-only /* Define if your linker links a mix of read-only
and read-write sections into a read-write section. */ and read-write sections into a read-write section. */
#undef HAVE_LD_RO_RW_SECTION_MIXING #undef HAVE_LD_RO_RW_SECTION_MIXING
...@@ -514,15 +508,6 @@ ...@@ -514,15 +508,6 @@
/* Define if your MIPS libgloss linker scripts consistently include STARTUP directives. */ /* Define if your MIPS libgloss linker scripts consistently include STARTUP directives. */
#undef HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES #undef HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES
/* Define to PREFIX/include if cpp should also search that directory. */
#undef PREFIX_INCLUDE_DIR
/* Bison unconditionally undefines `const' if neither `__STDC__' nor
__cplusplus are defined. That's a problem since we use `const' in
the GCC headers, and the resulting bison code is therefore type
unsafe. Thus, we must match the bison behavior here. */
#ifndef __STDC__
#ifndef __cplusplus
#undef const
#define const
#endif
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment