back out previous patch, replace with
* configure.ac (sim_hwflags): Use AC_DEFINE to define HAVE_UNION_SEMUN. * configure: Regenerate. * config.in: Regenerate. * hw_sem.c: #include "config.h". (HAVE_UNION_SEMUN): Renamed from HAS_UNION_SEMUN.
This commit is contained in:
parent
6ae841305c
commit
bf0275b1b5
|
@ -1,10 +1,11 @@
|
||||||
2009-09-15 Andreas Tobler <andreast-list@fgznet.ch>
|
2009-09-15 Andreas Tobler <andreast-list@fgznet.ch>
|
||||||
Doug Evans <dje@google.com>
|
Doug Evans <dje@google.com>
|
||||||
|
|
||||||
* configure.ac (sim_hwflags): Clean up definition, AC_SUBST it.
|
* configure.ac (sim_hwflags): Use AC_DEFINE to define HAVE_UNION_SEMUN.
|
||||||
* configure: Regenerate.
|
* configure: Regenerate.
|
||||||
* Makefile.in (SIM_HWFLAGS): New variable.
|
* config.in: Regenerate.
|
||||||
(STD_CFLAGS, NOWARN_CFLAGS): Add it.
|
* hw_sem.c: #include "config.h".
|
||||||
|
(HAVE_UNION_SEMUN): Renamed from HAS_UNION_SEMUN.
|
||||||
|
|
||||||
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||||
|
|
||||||
|
|
|
@ -70,7 +70,6 @@ MAKEINFO = makeinfo
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
|
|
||||||
SIM_CFLAGS = @sim_cflags@
|
SIM_CFLAGS = @sim_cflags@
|
||||||
SIM_HWFLAGS = @sim_hwflags@
|
|
||||||
INLINE_CFLAGS = @sim_inline@
|
INLINE_CFLAGS = @sim_inline@
|
||||||
BSWAP_CFLAGS = @sim_bswap@
|
BSWAP_CFLAGS = @sim_bswap@
|
||||||
ENDIAN_CFLAGS = @sim_endian@
|
ENDIAN_CFLAGS = @sim_endian@
|
||||||
|
@ -117,8 +116,8 @@ CONFIG_CFLAGS = $(BSWAP_CFLAGS) \
|
||||||
$(DEVZERO_CFLAGS)
|
$(DEVZERO_CFLAGS)
|
||||||
SIM_FPU_CFLAGS = @sim_fpu_cflags@
|
SIM_FPU_CFLAGS = @sim_fpu_cflags@
|
||||||
|
|
||||||
STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS) $(SIM_HWFLAGS)
|
STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) $(SIM_FPU_CFLAGS)
|
||||||
NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(SIM_FPU_CFLAGS) $(SIM_HWFLAGS)
|
NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(SIM_FPU_CFLAGS)
|
||||||
BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
|
BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
|
||||||
|
|
||||||
BUILD_LDFLAGS =
|
BUILD_LDFLAGS =
|
||||||
|
|
|
@ -272,6 +272,9 @@
|
||||||
/* Define to 1 if you have the `umask' function. */
|
/* Define to 1 if you have the `umask' function. */
|
||||||
#undef HAVE_UMASK
|
#undef HAVE_UMASK
|
||||||
|
|
||||||
|
/* Define if union semun is defined in <sys/sem.h> */
|
||||||
|
#undef HAVE_UNION_SEMUN
|
||||||
|
|
||||||
/* Define to 1 if you have the <unistd.h> header file. */
|
/* Define to 1 if you have the <unistd.h> header file. */
|
||||||
#undef HAVE_UNISTD_H
|
#undef HAVE_UNISTD_H
|
||||||
|
|
||||||
|
|
|
@ -589,7 +589,6 @@ ac_includes_default="\
|
||||||
#endif"
|
#endif"
|
||||||
|
|
||||||
ac_subst_vars='LTLIBOBJS
|
ac_subst_vars='LTLIBOBJS
|
||||||
sim_hwflags
|
|
||||||
sim_fpu
|
sim_fpu
|
||||||
sim_fpu_cflags
|
sim_fpu_cflags
|
||||||
sim_targ_vals
|
sim_targ_vals
|
||||||
|
@ -3741,9 +3740,9 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
|
if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
|
||||||
sim_hwflags="-DHAS_UNION_SEMUN"
|
|
||||||
else
|
$as_echo "#define HAVE_UNION_SEMUN 1" >>confdefs.h
|
||||||
sim_hwflags=""
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -6011,7 +6010,6 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile"
|
ac_config_files="$ac_config_files Makefile"
|
||||||
|
|
|
@ -301,9 +301,8 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
|
if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then
|
||||||
sim_hwflags="-DHAS_UNION_SEMUN"
|
AC_DEFINE(HAVE_UNION_SEMUN, 1,
|
||||||
else
|
[Define if union semun is defined in <sys/sem.h>])
|
||||||
sim_hwflags=""
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
@ -903,7 +902,6 @@ AC_SUBST(sim_callback)
|
||||||
AC_SUBST(sim_targ_vals)
|
AC_SUBST(sim_targ_vals)
|
||||||
AC_SUBST(sim_fpu_cflags)
|
AC_SUBST(sim_fpu_cflags)
|
||||||
AC_SUBST(sim_fpu)
|
AC_SUBST(sim_fpu)
|
||||||
AC_SUBST(sim_hwflags)
|
|
||||||
|
|
||||||
AC_OUTPUT(Makefile,
|
AC_OUTPUT(Makefile,
|
||||||
[case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])
|
[case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])
|
||||||
|
|
|
@ -100,7 +100,7 @@ typedef struct _hw_sem_device {
|
||||||
int count;
|
int count;
|
||||||
} hw_sem_device;
|
} hw_sem_device;
|
||||||
|
|
||||||
#if !HAS_UNION_SEMUN
|
#ifndef HAVE_UNION_SEMUN
|
||||||
union semun {
|
union semun {
|
||||||
int val;
|
int val;
|
||||||
struct semid_ds *buf;
|
struct semid_ds *buf;
|
||||||
|
|
Loading…
Reference in New Issue