Message ID | CACysShiTsza6Tpd-05jiHBdkcqybNg1wEij_cKzpQ90S5Ey0NQ@mail.gmail.com |
---|---|
State | New |
Headers | show |
On 27/03/2013, at 4:14 AM, Alexander Ivchenko wrote: > Hi, > > Since almost three months have passed I feel that I need to recheck the patch > before commiting it. I fixed what Maxim mentioned and also I fixed: The patch is OK with 2 changes: 1. s/default_have_ifunc_p/default_has_ifunc_p/ The new target hook is called "has_ifunc_p", so "has" in the name of its default implementation is more appropriate. > > diff --git a/gcc/configure b/gcc/configure > old mode 100755 > new mode 100644 > index eac96cd..928693a > --- a/gcc/configure > +++ b/gcc/configure > @@ -22055,11 +22055,14 @@ else > enable_gnu_indirect_function="$default_gnu_indirect_function" > fi > > -if test x$enable_gnu_indirect_function = xyes; then > > -$as_echo "#define HAVE_GNU_INDIRECT_FUNCTION 1" >>confdefs.h > +gif=`if test $enable_gnu_indirect_function == yes; then echo 1; else > echo 0; fi` 2. gif=`if test x$enable_gnu_indirect_function = xyes; then echo 1; else echo 0; fi` Note that canonical equality operator of 'test' is "=", not "==". The 'x' before the variable is a good practice to handle empty definitions of shell variables (`if test = yes;` will produce an error). Oh, and in the changelog you have a typo "linux-androids.h" -> "linux-android.h". Otherwise OK. Thanks, -- Maxim Kuvyrkov KugelWorks
> > Otherwise OK. > > Thanks, Hi, chacked into trunk: http://gcc.gnu.org/ml/gcc-cvs/2013-03/msg00785.html Thanks, K
On Wed, Mar 27, 2013 at 01:56:48PM +0400, Kirill Yukhin wrote: > > > > Otherwise OK. > > > > Thanks, > > Hi, chacked into trunk: http://gcc.gnu.org/ml/gcc-cvs/2013-03/msg00785.html This leads to: ../../gcc/config/t-linux-android:22: warning: overriding recipe for target `linux-android.o' ../../gcc/config/t-linux-android:22: warning: ignoring old recipe for target `linux-android.o' for arm*-linux* target (cross in my case). t-linux-android is listed twice. Jakub
diff --git a/gcc/configure b/gcc/configure old mode 100755 new mode 100644 index eac96cd..928693a --- a/gcc/configure +++ b/gcc/configure @@ -22055,11 +22055,14 @@ else enable_gnu_indirect_function="$default_gnu_indirect_function" fi -if test x$enable_gnu_indirect_function = xyes; then -$as_echo "#define HAVE_GNU_INDIRECT_FUNCTION 1" >>confdefs.h +gif=`if test $enable_gnu_indirect_function == yes; then echo 1; else echo 0; fi` + +cat >>confdefs.h <<_ACEOF +#define HAVE_GNU_INDIRECT_FUNCTION $gif +_ACEOF + -fi if test $in_tree_ld != yes ; then ld_ver=`$gcc_cv_ld --version 2>/dev/null | sed 1q` diff --git a/gcc/configure.ac b/gcc/configure.ac index 40a1af7..51d334c 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2299,10 +2299,11 @@ AC_ARG_ENABLE(gnu-indirect-function, Valid choices are 'yes' and 'no'.]) ;; esac], [enable_gnu_indirect_function="$default_gnu_indirect_function"]) -if test x$enable_gnu_indirect_function = xyes; then - AC_DEFINE(HAVE_GNU_INDIRECT_FUNCTION, 1, - [Define if your system supports gnu indirect functions.]) -fi + +gif=`if test $enable_gnu_indirect_function == yes; then echo 1; else echo 0; fi` +AC_DEFINE_UNQUOTED(HAVE_GNU_INDIRECT_FUNCTION, $gif, +[Define if your system supports gnu indirect functions.]) + HAVE_GNU_INDIRECT_FUNCTION was not defined on targets that don't have