diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 01ee687e43bc..80806b254c35 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -563,7 +563,6 @@ endif default:: ifneq (,$(CROSS_COMPILE)$(filter-out WINNT OS2,$(OS_ARCH))) -ifneq ($(OS_ARCH),SYMBIAN) # nsinstall doesn't get built until we enter config/ in the exports phase, # so we'll have to manually ensure it gets built here if we want to use # $(EXPORTS) @@ -573,7 +572,6 @@ $(PUBLIC) $(SDK_PUBLIC): config/nsinstall$(HOST_BIN_SUFFIX) config/nsinstall$(HOST_BIN_SUFFIX): $(srcdir)/config/nsinstall.c $(srcdir)/config/pathsub.c $(MAKE) -C config/ nsinstall$(HOST_BIN_SUFFIX) endif -endif include $(topsrcdir)/config/rules.mk diff --git a/js/src/configure.in b/js/src/configure.in index 55a06a47f622..7ee0053208bf 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -501,40 +501,6 @@ if test "$target" != "$host"; then ;; esac - case "$target" in - *symbian*) - AC_ARG_WITH(symbian-sdk, - [ --with-symbian-sdk=SYMBIAN_SDK_DIR - The path to the Symbian SDK], - SYMBIAN_SDK_DIR=$withval) - - OS_EXE_CFLAGS="$OS_EXE_CFLAGS -D__EXE__" - CFLAGS="-MD -nostdinc" - SYMBIAN_SYS_INCLUDE="-I$SYMBIAN_SDK_DIR/Epoc32/include -I$SYMBIAN_SDK_DIR/Epoc32/include/variant -I$SYMBIAN_SDK_DIR/Epoc32/include/stdapis" - - case "$target" in - *-symbianelf) - OS_TARGET=GCCE - CC=arm-none-symbianelf-gcc.exe - CXX=arm-none-symbianelf-g++.exe - LD=arm-none-symbianelf-ld.exe - AR=arm-none-symbianelf-ar.exe - CPP=arm-none-symbianelf-cpp.exe - CFLAGS="$CFLAGS -c -Wall -Wno-unknown-pragmas -fexceptions -march=armv5t -mapcs -pipe -msoft-float" - CXXFLAGS="$CFLAGS -Wno-ctor-dtor-privacy" - GCCE_INCLUDE="-include $SYMBIAN_SDK_DIR/EPOC32/INCLUDE/GCCE/GCCE.h -D__PRODUCT_INCLUDE__=$SYMBIAN_SDK_DIR/Epoc32/include/variant/Symbian_OS_v9.2.hrh" - CFLAGS="$CFLAGS ${GCCE_INCLUDE} -x c" - CXXFLAGS="$CXXFLAGS ${GCCE_INCLUDE} -x c++" - CPPFLAGS="$CPPFLAGS ${SYMBIAN_SYS_INCLUDE}" - ;; - *-symbianwinscw) - dnl TODO: add emulator build code - OS_TARGET=WINSCW - ;; - esac - ;; - esac - AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :) unset ac_cv_prog_CC AC_PROG_CC @@ -2055,33 +2021,6 @@ ia64*-hpux*) MC=mc.exe fi ;; -*-symbian*) - - AC_DEFINE(XP_UNIX) - AC_DEFINE(SYMBIAN) - AC_DEFINE(__arm__) - AC_DEFINE(__SYMBIAN32__) - AC_DEFINE(_UNICODE) - AC_DEFINE(NDEBUG) - AC_DEFINE(__SUPPORT_CPP_EXCEPTIONS__) - AC_DEFINE(MOZ_STDERR_TO_STDOUT) - AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) - AC_DEFINE(HAVE_SOCKLEN_T) - AC_DEFINE(__GCCE__) - - CPU_ARCH=ARM - OS_RELEASE=9.2 - OS_ARCH=SYMBIAN - USE_PTHREADS=1 - LIB_SUFFIX=lib - DLL_SUFFIX=dll - MKSHLIB= - DSO_LDOPTS= - DSO_CFLAGS= - VISIBILITY_FLAGS= - TARGET_NSPR_MDCPUCFG='\"md/_symbian.cfg\"' - RANLIB='echo no ranlib ' -;; *-mingw*) DSO_CFLAGS= @@ -5065,10 +5004,6 @@ case "$target" in *-mingw*) NO_EDITLINE=1 ;; -*-symbian*) - NO_EDITLINE=1 - JS_DISABLE_SHELL=1 - ;; *) ;; esac diff --git a/js/src/jstypes.h b/js/src/jstypes.h index 8ff593ed620c..994e5bd2e1ab 100644 --- a/js/src/jstypes.h +++ b/js/src/jstypes.h @@ -88,13 +88,6 @@ # define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type # define JS_EXPORT_DATA(__type) __declspec(dllexport) __type -#elif defined(__SYMBIAN32__) - -# define JS_EXTERN_API(__type) extern EXPORT_C __type -# define JS_EXPORT_API(__type) EXPORT_C __type -# define JS_EXTERN_DATA(__type) extern EXPORT_C __type -# define JS_EXPORT_DATA(__type) EXPORT_C __type - #else /* Unix */ # ifdef HAVE_VISIBILITY_ATTRIBUTE @@ -131,8 +124,6 @@ # endif #elif defined(XP_OS2) # define JS_IMPORT_API(__x) __declspec(dllimport) __x -#elif defined(__SYMBIAN32__) -# define JS_IMPORT_API(__x) IMPORT_C __x #else # define JS_IMPORT_API(__x) JS_EXPORT_API (__x) #endif @@ -141,12 +132,6 @@ # define JS_IMPORT_DATA(__x) __declspec(dllimport) __x #elif defined(XP_OS2) # define JS_IMPORT_DATA(__x) __declspec(dllimport) __x -#elif defined(__SYMBIAN32__) -# if defined(__CW32__) -# define JS_IMPORT_DATA(__x) __declspec(dllimport) __x -# else -# define JS_IMPORT_DATA(__x) IMPORT_C __x -# endif #else # define JS_IMPORT_DATA(__x) JS_EXPORT_DATA (__x) #endif diff --git a/js/src/xpconnect/shell/xpcshell.cpp b/js/src/xpconnect/shell/xpcshell.cpp index aa7034f828bc..9025466cced6 100644 --- a/js/src/xpconnect/shell/xpcshell.cpp +++ b/js/src/xpconnect/shell/xpcshell.cpp @@ -86,9 +86,6 @@ #ifdef XP_WIN #include #endif -#ifdef __SYMBIAN32__ -#include -#endif #include "nsIScriptSecurityManager.h" #include "nsIPrincipal.h" diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp index f3b1c57275d9..5ca21ff72c69 100644 --- a/netwerk/protocol/file/nsFileProtocolHandler.cpp +++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp @@ -187,7 +187,7 @@ nsFileProtocolHandler::ReadURLFile(nsIFile* aFile, nsIURI** aURI) return rv; } -#elif defined(XP_UNIX) && !defined(__SYMBIAN32__) +#elif defined(XP_UNIX) NS_IMETHODIMP nsFileProtocolHandler::ReadURLFile(nsIFile* aFile, nsIURI** aURI) {