Remove Symbian makefile

* build/s60v3/bld.inf: Remove.
* build/s60v3/libgc.mmp: Likewise.
* doc/README.symbian: Copy content of bld.inf and libgc.mmp (as
a sample build configuration); add global_end.cpp, global_start.cpp,
init_global_static_roots.cpp as source files.
* Makefile.am (EXTRA_DIST): Remove bld.inf, libgc.mmp items.
* README.md (Installation and Portability): Do not mention
Symbian-specific makefile.

5 files changed, 58 insertions, 94 deletions

diff --git a/Makefile.am b/Makefile.am
index dd808935..01acb649 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -184,7 +184,7 @@ CCASFLAGS += $(DEFS)
 # other makefiles
 EXTRA_DIST += NT_MAKEFILE OS2_MAKEFILE PCR-Makefile digimars.mak \
     Makefile.direct SMakefile.amiga WCC_MAKEFILE autogen.sh CMakeLists.txt \
-    Config.cmake.in build/s60v3/bld.inf build/s60v3/libgc.mmp
+    Config.cmake.in
 
 # files used by makefiles other than Makefile.am
 #
diff --git a/README.md b/README.md
index 4db555c4..f365dbb1 100644
--- a/README.md
+++ b/README.md
@@ -261,9 +261,8 @@ The collector currently is designed to run essentially unmodified on
 machines that use a flat 32-bit or 64-bit address space.
 That includes the vast majority of Workstations and X86 (X >= 3) PCs.
 
-In a few cases (Amiga, OS/2, PCR, Symbian, Win32) a separate makefile
-or equivalent is supplied.  Many of these have separate a host-specific
-doc/README.* file.
+In a few cases (Amiga, OS/2, PCR, Win32) a separate makefile or equivalent
+is supplied.  Many of these have a separate host-specific doc/README.* file.
 
 Dynamic libraries are completely supported only under SunOS/Solaris,
 (and even that support is not functional on the last Sun 3 release),
diff --git a/build/s60v3/bld.inf b/build/s60v3/bld.inf
deleted file mode 100644
index 491fcf43..00000000
--- a/build/s60v3/bld.inf
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- Name : bld.inf
- Description : This file provides the information required for building the
- whole of a libgc.
-*/
-
-PRJ_PLATFORMS
-default armv5
-
-PRJ_MMPFILES
-libgc.mmp
diff --git a/build/s60v3/libgc.mmp b/build/s60v3/libgc.mmp
deleted file mode 100644
index ada5ad64..00000000
--- a/build/s60v3/libgc.mmp
+++ /dev/null
@@ -1,78 +0,0 @@
-TARGET     libgc.dll
-
-TARGETTYPE        dll
-UID       0x1000008d 0x200107C2 // check uid
-
-EXPORTUNFROZEN
-EPOCALLOWDLLDATA
-//ALWAYS_BUILD_AS_ARM
-//nocompresstarget
-//srcdbg
-//baseaddress   00500000
-//LINKEROPTION CW -map libgc.map
-//LINKEROPTION CW -filealign 0x10000
-
-CAPABILITY PowerMgmt ReadDeviceData ReadUserData WriteDeviceData WriteUserData SwEvent LocalServices NetworkServices UserEnvironment
-
-
-MACRO ALL_INTERIOR_POINTERS
-MACRO NO_EXECUTE_PERMISSION
-MACRO USE_MMAP
-MACRO GC_ATOMIC_UNCOLLECTABLE
-MACRO GC_DONT_REGISTER_MAIN_STATIC_DATA
-MACRO GC_DLL
-MACRO JAVA_FINALIZATION
-MACRO SYMBIAN
-MACRO ENABLE_DISCLAIM
-//MACRO GC_GCJ_SUPPORT
-
-USERINCLUDE      ..\..\include
-USERINCLUDE      ..\..\include\private
-
-SYSTEMINCLUDE   \epoc32\include
-SYSTEMINCLUDE   \epoc32\include\stdapis
-
-SOURCEPATH        ..\..\
-
-SOURCE          allchblk.c
-SOURCE          alloc.c
-SOURCE          blacklst.c
-SOURCE          dbg_mlc.c
-SOURCE          dyn_load.c
-SOURCE          finalize.c
-SOURCE          fnlz_mlc.c
-//SOURCE        gc_badalc.cpp
-//SOURCE        gc_cpp.cpp
-SOURCE          gcj_mlc.c
-SOURCE          headers.c
-SOURCE          mach_dep.c
-SOURCE          malloc.c
-SOURCE          mallocx.c
-SOURCE          mark.c
-SOURCE          mark_rts.c
-SOURCE          misc.c
-SOURCE          new_hblk.c
-SOURCE          obj_map.c
-SOURCE          os_dep.c
-SOURCE          extra/symbian.cpp
-SOURCE          ptr_chck.c
-SOURCE          reclaim.c
-SOURCE          typd_mlc.c
-
-/*
-#ifdef ENABLE_ABIV2_MODE
-  DEBUGGABLE_UDEBONLY
-#endif
-*/
-
-// Using main() as entry point
-STATICLIBRARY   libcrt0.lib
-
-// libc and euser are always needed when using main() entry point
-LIBRARY         libc.lib
-
-
-LIBRARY euser.lib
-LIBRARY efsrv.lib
-LIBRARY avkon.lib
-LIBRARY eikcore.lib
diff --git a/doc/README.symbian b/doc/README.symbian
index 515a9cca..c3e0c833 100644
--- a/doc/README.symbian
+++ b/doc/README.symbian
@@ -1,5 +1,5 @@
 Instructions for Symbian:
-1. Build: use libgc.mmp
+1. Build: use libgc.mmp (the sample for s60v3 is provided below)
 2. Limitations
 2.1. No multi-threaded support yet
 2.2. Be careful with limitation that emulator introduces: Static roots are not
@@ -9,3 +9,57 @@ Consequently, on emulator, you can only use dlls or exe, and retrieve static
 roots by calling global_init_static_root per dll (or exe).
 On target, only libs are supported, because static roots are retrieved by
 linker flags, by calling global_init_static_root in main exe.
+
+
+bld.inf sample contents:
+
+PRJ_PLATFORMS
+default armv5
+
+PRJ_MMPFILES
+libgc.mmp
+
+
+libgc.mmp sample contents:
+
+TARGET libgc.dll
+
+TARGETTYPE dll
+UID 0x1000008d 0x200107C2 // check uid
+
+EXPORTUNFROZEN
+EPOCALLOWDLLDATA
+
+CAPABILITY PowerMgmt ReadDeviceData ReadUserData WriteDeviceData WriteUserData SwEvent LocalServices NetworkServices UserEnvironment
+
+MACRO ALL_INTERIOR_POINTERS
+MACRO NO_EXECUTE_PERMISSION
+MACRO USE_MMAP
+MACRO GC_ATOMIC_UNCOLLECTABLE
+MACRO GC_DONT_REGISTER_MAIN_STATIC_DATA
+MACRO GC_DLL
+MACRO JAVA_FINALIZATION
+MACRO SYMBIAN
+MACRO ENABLE_DISCLAIM
+
+USERINCLUDE .\include
+USERINCLUDE .\include\private
+
+SYSTEMINCLUDE \epoc32\include
+SYSTEMINCLUDE \epoc32\include\stdapis
+
+SOURCEPATH .
+
+SOURCE extra/gc.c
+SOURCE extra/symbian.cpp
+
+SOURCE extra/symbian/global_end.cpp
+SOURCE extra/symbian/global_start.cpp
+SOURCE extra/symbian/init_global_static_roots.cpp
+
+STATICLIBRARY libcrt0.lib
+LIBRARY libc.lib
+LIBRARY euser.lib
+LIBRARY efsrv.lib
+LIBRARY avkon.lib
+LIBRARY eikcore.lib