diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-03-30 02:26:24 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-30 03:06:34 -0400 |
| commit | 457983e3a30212740a599ffa7cbf5142ffe67367 (patch) | |
| tree | 42903e7ed10e21de6b6b20db48b7d032573c6da3 | |
| parent | 99956be1d73c5705b4032f9add2d3cfbf6b634a3 (diff) | |
| download | gdb-457983e3a30212740a599ffa7cbf5142ffe67367.zip gdb-457983e3a30212740a599ffa7cbf5142ffe67367.tar.gz gdb-457983e3a30212740a599ffa7cbf5142ffe67367.tar.bz2 | |
sim: arm: move COPRO settings to the makefile
These values are the same all the time, so just list them directly in
the Makefile.
| -rw-r--r-- | sim/arm/ChangeLog | 8 | ||||
| -rw-r--r-- | sim/arm/Makefile.in | 5 | ||||
| -rwxr-xr-x | sim/arm/configure | 22 | ||||
| -rw-r--r-- | sim/arm/configure.ac | 6 |
4 files changed, 12 insertions, 29 deletions
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index 94bd72f..9441a61 100644 --- a/sim/arm/ChangeLog +++ b/sim/arm/ChangeLog @@ -1,3 +1,11 @@ +2015-03-30 Mike Frysinger <vapier@gentoo.org> + + * Makefile.in (COPRO): Delete. + (SIM_OBJS): Expand COPRO. + * configure.ac: Deletd stdint.h check. + (COPRO): Delete. + * configure: Regenerate. + 2015-03-16 Mike Frysinger <vapier@gentoo.org> * config.in, configure: Regenerate. diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in index 80271c0..f218633 100644 --- a/sim/arm/Makefile.in +++ b/sim/arm/Makefile.in @@ -20,13 +20,12 @@ SIM_EXTRA_CFLAGS = -DMODET -DNEED_UI_LOOP_HOOK -DSIM_TARGET_SWITCHES \ -DSIM_USE_DEPRECATED_RUN_FRONTEND -COPRO=@COPRO@ - # Use the deprecated run frontend until we migrate to nrun.o SIM_RUN_OBJS = run.o SIM_OBJS = armemu26.o armemu32.o arminit.o armos.o armsupp.o \ - armvirt.o bag.o thumbemu.o wrapper.o sim-load.o $(COPRO) + armvirt.o bag.o thumbemu.o wrapper.o sim-load.o \ + armcopro.o maverick.o iwmmxt.o ## COMMON_POST_CONFIG_FRAG diff --git a/sim/arm/configure b/sim/arm/configure index 4e0221e..fa26277 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -601,7 +601,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS cgen_breaks -COPRO REPORT_BUGS_TEXI REPORT_BUGS_TO PKGVERSION @@ -12355,7 +12354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12358 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12461,7 +12460,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12464 "configure" +#line 12463 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12951,23 +12950,6 @@ sim_link_links="${sim_link_links} targ-vals.def" -for ac_header in stdint.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" -if test "x$ac_cv_header_stdint_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDINT_H 1 -_ACEOF - -fi - -done - - -COPRO="armcopro.o maverick.o iwmmxt.o" - - - ac_sources="$sim_link_files" ac_dests="$sim_link_links" diff --git a/sim/arm/configure.ac b/sim/arm/configure.ac index 82d995f..799a5df 100644 --- a/sim/arm/configure.ac +++ b/sim/arm/configure.ac @@ -5,10 +5,4 @@ sinclude(../common/acinclude.m4) SIM_AC_COMMON -AC_CHECK_HEADERS(stdint.h) - -COPRO="armcopro.o maverick.o iwmmxt.o" - -AC_SUBST(COPRO) - SIM_AC_OUTPUT |