OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Doug Evans 2009-09-15 23:26:44 +00:00
parent 6ae841305c
commit bf0275b1b5
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sim/ppc/ChangeLog
View File

@ -1,10 +1,11 @@
2009-09-15 Andreas Tobler <andreast-list@fgznet.ch>
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.
* Makefile.in (SIM_HWFLAGS): New variable.
(STD_CFLAGS, NOWARN_CFLAGS): Add it.
* config.in: Regenerate.
* hw_sem.c: #include "config.h".
(HAVE_UNION_SEMUN): Renamed from HAS_UNION_SEMUN.
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

5
sim/ppc/Makefile.in
View File

@ -70,7 +70,6 @@ MAKEINFO = makeinfo
RANLIB = @RANLIB@
SIM_CFLAGS = @sim_cflags@
SIM_HWFLAGS = @sim_hwflags@
INLINE_CFLAGS = @sim_inline@
BSWAP_CFLAGS = @sim_bswap@
ENDIAN_CFLAGS = @sim_endian@
@ -117,8 +116,8 @@ CONFIG_CFLAGS = $(BSWAP_CFLAGS) \
$(DEVZERO_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)
NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(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)
BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(INCLUDES) $(WARNING_CFLAGS)
BUILD_LDFLAGS =

3
sim/ppc/config.in
View File

@ -272,6 +272,9 @@
/* Define to 1 if you have the `umask' function. */
#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. */
#undef HAVE_UNISTD_H

8
sim/ppc/configure vendored
View File

@ -589,7 +589,6 @@ ac_includes_default="\
#endif"
ac_subst_vars='LTLIBOBJS
sim_hwflags
sim_fpu
sim_fpu_cflags
sim_targ_vals
@ -3741,9 +3740,9 @@ else
fi
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
sim_hwflags=""
$as_echo "#define HAVE_UNION_SEMUN 1" >>confdefs.h
fi
@ -6011,7 +6010,6 @@ fi
ac_config_files="$ac_config_files Makefile"

6
sim/ppc/configure.ac
View File

@ -301,9 +301,8 @@ else
fi
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
sim_hwflags=""
AC_DEFINE(HAVE_UNION_SEMUN, 1,
[Define if union semun is defined in <sys/sem.h>])
fi
@ -903,7 +902,6 @@ AC_SUBST(sim_callback)
AC_SUBST(sim_targ_vals)
AC_SUBST(sim_fpu_cflags)
AC_SUBST(sim_fpu)
AC_SUBST(sim_hwflags)
AC_OUTPUT(Makefile,
[case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])

2
sim/ppc/hw_sem.c
View File

@ -100,7 +100,7 @@ typedef struct _hw_sem_device {
int count;
} hw_sem_device;
#if !HAS_UNION_SEMUN
#ifndef HAVE_UNION_SEMUN
union semun {
int val;
struct semid_ds *buf;