Index: ext/misc/amatch.c
==================================================================
--- ext/misc/amatch.c
+++ ext/misc/amatch.c
@@ -999,23 +999,17 @@
 }
 
 /* Circumvent compiler warnings about the use of strcpy() by supplying
 ** our own implementation.
 */
-#if defined(__OpenBSD__)
 static void amatchStrcpy(char *dest, const char *src){
   while( (*(dest++) = *(src++))!=0 ){}
 }
 static void amatchStrcat(char *dest, const char *src){
   while( *dest ) dest++;
   amatchStrcpy(dest, src);
 }
-#else
-# define amatchStrcpy strcpy
-# define amatchStrcat strcat
-#endif
-
 
 /*
 ** Add a new amatch_word object to the queue.
 **
 ** If a prior amatch_word object with the same zWord, and nMatch

Index: test/releasetest.tcl
==================================================================
--- test/releasetest.tcl
+++ test/releasetest.tcl
@@ -177,11 +177,11 @@
   "Locking-Style" {
     -O2
     -DSQLITE_ENABLE_LOCKING_STYLE=1
   }
   "Apple" {
-    -O1   # Avoid a compiler bug in gcc 4.2.1 build 5658
+    -Os
     -DHAVE_GMTIME_R=1
     -DHAVE_ISNAN=1
     -DHAVE_LOCALTIME_R=1
     -DHAVE_PREAD=1
     -DHAVE_PWRITE=1