From: <ale...@us...> - 2010-10-15 09:07:19
|
Revision: 51702 http://firebird.svn.sourceforge.net/firebird/?rev=51702&view=rev Author: alexpeshkoff Date: 2010-10-15 09:07:13 +0000 (Fri, 15 Oct 2010) Log Message: ----------- CORE-3184: Committed Damyan's patch - port for linux/hppa and linux/alpha Modified Paths: -------------- firebird/branches/B2_5_Release/configure.in firebird/branches/B2_5_Release/src/jrd/common.h firebird/branches/B2_5_Release/src/jrd/inf_pub.h firebird/branches/B2_5_Release/src/jrd/pag.cpp firebird/branches/B2_5_Release/src/jrd/utl.cpp Modified: firebird/branches/B2_5_Release/configure.in =================================================================== --- firebird/branches/B2_5_Release/configure.in 2010-10-15 09:05:34 UTC (rev 51701) +++ firebird/branches/B2_5_Release/configure.in 2010-10-15 09:07:13 UTC (rev 51702) @@ -271,6 +271,28 @@ SHRLIB_EXT=so ;; + hppa*-*-linux*) + MAKEFILE_PREFIX=linux_generic + INSTALL_PREFIX=linux + PLATFORM=LINUX + AC_DEFINE(LINUX, 1, [Define this if OS is Linux]) + AC_DEFINE(HPPA, 1, [Define this if CPU is HPPA]) + LOCK_MANAGER_FLG=Y + EDITLINE_FLG=Y + SHRLIB_EXT=so + ;; + + alpha*-*-linux*) + MAKEFILE_PREFIX=linux_generic + INSTALL_PREFIX=linux + PLATFORM=LINUX + AC_DEFINE(LINUX, 1, [Define this if OS is Linux]) + AC_DEFINE(ALPHA, 1, [Define this if CPU is Alpha]) + LOCK_MANAGER_FLG=Y + EDITLINE_FLG=Y + SHRLIB_EXT=so + ;; + *-*-linux* | *-*-gnu*) MAKEFILE_PREFIX=linux_generic INSTALL_PREFIX=linux Modified: firebird/branches/B2_5_Release/src/jrd/common.h =================================================================== --- firebird/branches/B2_5_Release/src/jrd/common.h 2010-10-15 09:05:34 UTC (rev 51701) +++ firebird/branches/B2_5_Release/src/jrd/common.h 2010-10-15 09:07:13 UTC (rev 51702) @@ -182,6 +182,16 @@ #define RISC_ALIGNMENT #endif /* sheb */ +#ifdef HPPA +#define IMPLEMENTATION isc_info_db_impl_linux_hppa /* 82 */ +#define RISC_ALIGNMENT +#endif /* hppa */ + +#ifdef ALPHA +#define IMPLEMENTATION isc_info_db_impl_linux_alpha /* 83 */ +#define RISC_ALIGNMENT +#endif /* alpha */ + #endif /* LINUX */ Modified: firebird/branches/B2_5_Release/src/jrd/inf_pub.h =================================================================== --- firebird/branches/B2_5_Release/src/jrd/inf_pub.h 2010-10-15 09:05:34 UTC (rev 51701) +++ firebird/branches/B2_5_Release/src/jrd/inf_pub.h 2010-10-15 09:07:13 UTC (rev 51702) @@ -213,6 +213,8 @@ isc_info_db_impl_linux_sh = 80, isc_info_db_impl_linux_sheb = 81, + isc_info_db_impl_linux_hppa = 82, + isc_info_db_impl_linux_alpha = 83, isc_info_db_impl_last_value // Leave this LAST! }; Modified: firebird/branches/B2_5_Release/src/jrd/pag.cpp =================================================================== --- firebird/branches/B2_5_Release/src/jrd/pag.cpp 2010-10-15 09:05:34 UTC (rev 51701) +++ firebird/branches/B2_5_Release/src/jrd/pag.cpp 2010-10-15 09:07:13 UTC (rev 51702) @@ -160,9 +160,11 @@ static const int CLASS_LINUX_S390 = 37; // LINUX/s390 static const int CLASS_LINUX_SH = 38; // LINUX/SH (little-endian) static const int CLASS_LINUX_SHEB = 39; // LINUX/SH (big-endian) +static const int CLASS_LINUX_HPPA = 40; // LINUX/HPPA +static const int CLASS_LINUX_ALPHA = 41; // LINUX/ALPHA static const int CLASS_MAX10 = CLASS_LINUX_AMD64; // This should not be changed, no new ports with ODS10 -static const int CLASS_MAX = CLASS_LINUX_SHEB; +static const int CLASS_MAX = CLASS_LINUX_ALPHA; // ARCHITECTURE COMPATIBILITY CLASSES @@ -259,7 +261,9 @@ archBigEndian, // CLASS_LINUX_S390X archBigEndian, // CLASS_LINUX_S390 archLittleEndian, // CLASS_LINUX_SH - archBigEndian // CLASS_LINUX_SHEB + archBigEndian, // CLASS_LINUX_SHEB + archBigEndian, // CLASS_LINUX_HPPA + archLittleEndian // CLASS_LINUX_ALPHA }; #ifdef __sun @@ -319,6 +323,10 @@ const SSHORT CLASS = CLASS_LINUX_SH; #elif defined(SHEB) const SSHORT CLASS = CLASS_LINUX_SHEB; +#elif defined(HPPA) +const SSHORT CLASS = CLASS_LINUX_HPPA; +#elif defined(ALPHA) +const SSHORT CLASS = CLASS_LINUX_ALPHA; #else #error no support on other hardware for Linux #endif Modified: firebird/branches/B2_5_Release/src/jrd/utl.cpp =================================================================== --- firebird/branches/B2_5_Release/src/jrd/utl.cpp 2010-10-15 09:05:34 UTC (rev 51701) +++ firebird/branches/B2_5_Release/src/jrd/utl.cpp 2010-10-15 09:07:13 UTC (rev 51702) @@ -225,7 +225,9 @@ "Firebird/linux s390x", // 78 "Firebird/linux s390", // 79 "Firebird/linux SH", // 80 - "Firebird/linux SHEB" // 81 + "Firebird/linux SHEB", // 81 + "Firebird/linux HPPA", // 82 + "Firebird/linux ALPHA" // 83 }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |