updated Makefile.vxwSH4 and renamed it to Makefile.vxworks,

should now be able to support SH4 and PPC targets. (CVS 6500)

FossilOrigin-Name: e4a370c72dd3204be099a6706128507d5c06170c

diff --git a/Makefile.vxwSH4 b/Makefile.vxworks
similarity index 96%
rename from Makefile.vxwSH4
rename to Makefile.vxworks
index 77ba884e9cb4ca3cc5ddeb7c816ac1145cba3acc..8dde391df82b19ed8babd7cb76dc043c0d8e9a6d 100644 (file)
--- a/Makefile.vxwSH4
+++ b/Makefile.vxworks
@@ -13,7 +13,7 @@ include $(WIND_USR)/tool/gnu/make.$(FORCPU)
 #### The toplevel directory of the source tree.  This is the directory
 #    that contains this "Makefile.in" and the "configure.in" script.
 #
-TOP = ../sqlite-3.6.5
+TOP = .
 
 #### C Compiler and options for use in building executables that
 #    will run on the platform that is doing the build.
@@ -42,13 +42,14 @@ THREADLIB =
 
 #### Specify any extra libraries needed to access required functions.
 #
-#TLIBS = -lrt    # fdatasync on Solaris 8
-#for x86 vxWorks
-#TLIBS += TLIBS = $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
-#for SH4 shared library
-TLIBS_SHARED += -L$(WIND_USR)/lib/sh/SH32/commonle/PIC
-#TLIBS_SHARED += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
-#for SH4 static
+ifeq ($(CPU),SH32) 
+  # for SH4 shared library
+  TLIBS_SHARED += -L$(WIND_USR)/lib/sh/SH32/commonle/PIC
+else 
+  # for all other CPUs shared library
+  TLIBS_SHARED += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
+endif
+# for static library
 TLIBS += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
 
 #### Leave SQLITE_DEBUG undefined for maximum speed.  Use SQLITE_DEBUG=1
@@ -193,18 +194,18 @@ TCCX_SHARED = $(TCC_SHARED) $(OPTS) -I. -I$(TOP)/src -I$(TOP) -I$(TOP)/ext/rtree
 # Object files for the SQLite library.
 #
 LIBOBJ+= alter.o analyze.o attach.o auth.o \
-         bitvec.o btmutex.o btree.o build.o \
+         backup.o bitvec.o btmutex.o btree.o build.o \
          callback.o complete.o date.o delete.o \
          expr.o fault.o func.o global.o hash.o \
          icu.o insert.o journal.o legacy.o loadext.o \
          main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o memjournal.o \
          mutex.o mutex_os2.o mutex_unix.o mutex_w32.o mutex_noop.o \
          opcodes.o os.o os_os2.o os_unix.o os_win.o \
-         pager.o parse.o pcache.o pragma.o prepare.o printf.o \
-         random.o resolve.o rtree.o select.o status.o \
+         pager.o parse.o pcache.o pcache1.o pragma.o prepare.o printf.o \
+         random.o resolve.o rowset.o rtree.o select.o status.o \
          table.o tokenize.o trigger.o \
          update.o util.o vacuum.o \
-         vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbefifo.o vdbemem.o \
+         vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o \
          walker.o where.o utf.o vtab.o
 
 
@@ -215,6 +216,7 @@ SRC = \
   $(TOP)/src/analyze.c \
   $(TOP)/src/attach.c \
   $(TOP)/src/auth.c \
+  $(TOP)/src/backup.c \
   $(TOP)/src/bitvec.c \
   $(TOP)/src/btmutex.c \
   $(TOP)/src/btree.c \
@@ -260,12 +262,14 @@ SRC = \
   $(TOP)/src/pager.h \
   $(TOP)/src/parse.y \
   $(TOP)/src/pcache.c \
+  $(TOP)/src/pcache1.c \
   $(TOP)/src/pcache.h \
   $(TOP)/src/pragma.c \
   $(TOP)/src/prepare.c \
   $(TOP)/src/printf.c \
   $(TOP)/src/random.c \
   $(TOP)/src/resolve.c \
+  $(TOP)/src/rowset.c \
   $(TOP)/src/select.c \
   $(TOP)/src/status.c \
   $(TOP)/src/shell.c \
@@ -286,7 +290,6 @@ SRC = \
   $(TOP)/src/vdbeapi.c \
   $(TOP)/src/vdbeaux.c \
   $(TOP)/src/vdbeblob.c \
-  $(TOP)/src/vdbefifo.c \
   $(TOP)/src/vdbemem.c \
   $(TOP)/src/vdbeInt.h \
   $(TOP)/src/vtab.c \
@@ -316,6 +319,8 @@ SRC += \
 SRC += \
   $(TOP)/ext/fts3/fts3.c \
   $(TOP)/ext/fts3/fts3.h \
+  $(TOP)/ext/fts3/fts3_expr.c \
+  $(TOP)/ext/fts3/fts3_expr.h \
   $(TOP)/ext/fts3/fts3_hash.c \
   $(TOP)/ext/fts3/fts3_hash.h \
   $(TOP)/ext/fts3/fts3_icu.c \

diff --git a/manifest b/manifest
index 8590672224c027712688484101a0eb38d8c10c67..a2744b653fe7abba085aa9e363da70ed3331f3dd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Fix\smalloc5.test\sso\sit\swork\son\sboth\s64-bit\sand\s32-bit\ssystems.\s\sThe\n::tcl_platform(wordSize)\svariable\shas\sto\sbe\sused\sto\sadjust\ssome\smemory\nsizes.\s(CVS\s6499)
-D 2009-04-11T19:09:54
+C updated\sMakefile.vxwSH4\sand\srenamed\sit\sto\sMakefile.vxworks,\nshould\snow\sbe\sable\sto\ssupport\sSH4\sand\sPPC\stargets.\s(CVS\s6500)
+D 2009-04-13T08:14:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
-F Makefile.vxwSH4 d53b4be86491060d498b22148951b6d765884cab
+F Makefile.vxworks 40c707b2589f61436b89788003b1ccf5679ec3e6
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
 F VERSION 052bafc3a4e485aa1c340c5a27d643894625581d
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -717,7 +717,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 24ff486125b9ad62dd92314b62299093b55fe82b
-R e86f6859c90d597b3d4a24b866588e61
-U drh
-Z fa13966f764303f217f053b6716e8ac3
+P ea20f78edb50778c40ed7f03f894ab898f58d67c
+R b2b48373f211efc0059fb483ca63bf66
+U chw
+Z 74b49a81e829f336030a628842c211f4

diff --git a/manifest.uuid b/manifest.uuid
index 2a7aca77d1fcb2c7c1b209c9b69f6aaed1580ecb..005dbe3840ca74ad5f69a006f371e9047d784ea4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea20f78edb50778c40ed7f03f894ab898f58d67c
\ No newline at end of file
+e4a370c72dd3204be099a6706128507d5c06170c
\ No newline at end of file