From eb5090421a0452e1519c10734dac03c9cee39a58 Mon Sep 17 00:00:00 2001 From: cvs2svn <> Date: Mon, 17 Mar 2003 10:34:30 +0000 Subject: This commit was manufactured by cvs2svn to create branch 'cagney_lazyid-20030317-branch'. Sprout from offbyone-20030313-branch 2003-03-12 20:47:08 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch' Cherrypick from master 2003-03-17 10:34:29 UTC Nick Clifton '(O_SYS_CMDLINE): New pseudo opcode for command line processing.': ChangeLog Makefile.in Makefile.tpl include/opcode/ChangeLog include/opcode/h8300.h --- ChangeLog | 9 ++++++ Makefile.in | 82 +++++++++++++++++++++++++++++++++++++++++++++--- Makefile.tpl | 12 ++++--- include/opcode/ChangeLog | 5 +++ include/opcode/h8300.h | 2 ++ 5 files changed, 101 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6755512..3262979 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-03-14 Nathanael Nerode + + * Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES back down. + * Makefile.in: Regenerate. + +2003-03-14 Michael Chastain + + * Makefile.in: Regenerate with correct Makefile.def. + 2003-03-12 Nathanael Nerode * Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up. Delete unused diff --git a/Makefile.in b/Makefile.in index c9bc160..f70250d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,10 +20,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Don't pass command-line variables to submakes. -.NOEXPORT: -MAKEOVERRIDES= - # ------------------------------- # Standard Autoconf-set variables # ------------------------------- @@ -641,7 +637,8 @@ CLEAN_X11_MODULES = \ clean-gdb \ clean-expect \ clean-guile \ - clean-tk + clean-tk \ + clean-tix # The target built for a native build. # This list only includes modules actually being configured and built. @@ -5404,6 +5401,73 @@ install-tk: installdirs (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) +.PHONY: configure-tix maybe-configure-tix +maybe-configure-tix: +configure-tix: + @test ! -f tix/Makefile || exit 0; \ + [ -d tix ] || mkdir tix; \ + r=`${PWD}`; export r; \ + s=`cd $(srcdir); ${PWD}`; export s; \ + CC="$(CC)"; export CC; \ + CFLAGS="$(CFLAGS)"; export CFLAGS; \ + CXX="$(CXX)"; export CXX; \ + CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \ + if [ z$(build_canonical) != z$(host_canoncial) ] ; then \ + AR="$(AR)"; export AR; \ + AS="$(AS)"; export AS; \ + CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ + DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \ + LD="$(LD)"; export LD; \ + NM="$(NM)"; export NM; \ + RANLIB="$(RANLIB)"; export RANLIB; \ + WINDRES="$(WINDRES)"; export WINDRES; \ + OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \ + OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \ + fi; \ + echo Configuring in tix; \ + cd tix || exit 1; \ + case $(srcdir) in \ + \.) \ + srcdiroption="--srcdir=."; \ + libsrcdir=".";; \ + /* | [A-Za-z]:[\\/]*) \ + srcdiroption="--srcdir=$(srcdir)/tix"; \ + libsrcdir="$$s/tix";; \ + *) \ + srcdiroption="--srcdir=../$(srcdir)/tix"; \ + libsrcdir="$$s/tix";; \ + esac; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + || exit 1 + +.PHONY: all-tix maybe-all-tix +maybe-all-tix: +all-tix: configure-tix + @r=`${PWD}`; export r; \ + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) + + +.PHONY: check-tix +check-tix: + @r=`${PWD}`; export r; \ + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + + + +.PHONY: install-tix maybe-install-tix +maybe-install-tix: +install-tix: installdirs + @r=`${PWD}`; export r; \ + s=`cd $(srcdir); ${PWD}`; export s; \ + $(SET_LIB_PATH) \ + (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + + .PHONY: configure-libtermcap maybe-configure-libtermcap maybe-configure-libtermcap: configure-libtermcap: @@ -7461,10 +7525,18 @@ AUTOCONF = autoconf $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 cd $(srcdir) && $(AUTOCONF) +# ------------------------------ +# Special directives to GNU Make +# ------------------------------ + # Tell GNU make 3.79 not to run the top level in parallel. This # prevents contention for $builddir/$target/config.cache, as well # as minimizing scatter in file system caches. NOTPARALLEL = .NOTPARALLEL $(NOTPARALLEL): +# Don't pass command-line variables to submakes. +.NOEXPORT: +MAKEOVERRIDES= + # end of Makefile.in diff --git a/Makefile.tpl b/Makefile.tpl index ab37bdf..72e2498 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -23,10 +23,6 @@ in # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Don't pass command-line variables to submakes. -.NOEXPORT: -MAKEOVERRIDES= - # ------------------------------- # Standard Autoconf-set variables # ------------------------------- @@ -1454,10 +1450,18 @@ AUTOCONF = autoconf $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 cd $(srcdir) && $(AUTOCONF) +# ------------------------------ +# Special directives to GNU Make +# ------------------------------ + # Tell GNU make 3.79 not to run the top level in parallel. This # prevents contention for $builddir/$target/config.cache, as well # as minimizing scatter in file system caches. NOTPARALLEL = .NOTPARALLEL $(NOTPARALLEL): +# Don't pass command-line variables to submakes. +.NOEXPORT: +MAKEOVERRIDES= + # end of Makefile.in diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index f04439c..53adca3 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,8 @@ +2003-03-17 D.Venkatasubramanian + + * h8300.h (O_SYS_CMDLINE): New pseudo opcode for command line + processing. + 2003-02-21 Noida D.Venkatasubramanian * h8300.h (ldmac, stmac): Replace MACREG with MS32 and MD32. diff --git a/include/opcode/h8300.h b/include/opcode/h8300.h index 034c7bc..bdba345 100644 --- a/include/opcode/h8300.h +++ b/include/opcode/h8300.h @@ -313,6 +313,8 @@ struct h8_opcode #define O_SYS_CLOSE 105 #define O_SYS_STAT 106 #define O_SYS_FSTAT 107 +/* Space reserved for future file I/O system calls. */ +#define O_SYS_CMDLINE 120 /* End of System Call specific Changes. */ #define SB 0 #define SW 1 -- cgit v1.1