Attachment 156689 Details for Bug 200147 – armv6 support

[patch] armv6 support

databases_firebird25-server.patch (text/plain), 5.42 KB, created by Mikael Urankar on 2015-05-12 09:53:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2015-05-12 09:53:08 UTC

Size: 5.42 KB

patch

obsolete

>--- Makefile.orig
>+++ Makefile
>@@ -56,7 +56,7 @@ LD=	${CC}
> # Don't strip binary files
> STRIP=
> 
>-ONLY_FOR_ARCHS=	i386 amd64
>+ONLY_FOR_ARCHS=	i386 amd64 armv6
> CONFLICTS+=	firebird-client-2.0* firebird-server-2.0* \
> 		firebird-client-2.1* firebird-server-2.1*
> 
>@@ -97,6 +97,10 @@ CLIENT_BIN=	gpre isql-fb qli
> 
> .include <bsd.port.options.mk>
> 
>+.if ${ARCH} == armv6
>+BUILD_DEPENDS+=	${LOCALBASE}/lib/libatomic_ops.a:${PORTSDIR}/devel/libatomic_ops
>+.endif
>+
> .if ${PORT_OPTIONS:MDOCS}
> PORTDOCS=	*
> FB_DOCS_FILES=	WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \
>
>--- /dev/null
>+++ files/patch-builds_posix_prefix.freebsd__arm
>@@ -0,0 +1,35 @@
>+--- /dev/null	2015-01-26 08:33:06 UTC
>++++ builds/posix/prefix.freebsd_arm
>+@@ -0,0 +1,32 @@
>++# The contents of this file are subject to the Interbase Public
>++# License Version 1.0 (the "License"); you may not use this file
>++# except in compliance with the License. You may obtain a copy
>++# of the License at http://www.Inprise.com/IPL.html
>++#
>++# Software distributed under the License is distributed on an
>++# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
>++# or implied. See the License for the specific language governing
>++# rights and limitations under the License.
>++#
>++# The Original Code was created by Inprise Corporation
>++# and its predecessors. Portions created by Inprise Corporation are
>++#
>++# Copyright (C) 2000 Inprise Corporation
>++# All Rights Reserved.
>++# Contributor(s): ______________________________________.
>++# Start of file prefix.freebsd:        $(VERSION)      @PLATFORM@
>++#
>++# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
>++
>++OS_ServerFiles=inet_server.cpp
>++
>++LINK_OPTS+=-Wl,-rpath,../gen/firebird/lib
>++
>++PROD_FLAGS=-O3 -DNDEBUG -DFREEBSD -DARM -pipe -MMD -fPIC -fsigned-char -fmessage-length=0
>++DEV_FLAGS=-ggdb -DFREEBSD -DARM -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor
>++EMBED_UTIL_TARGETS=gstat gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
>++CLIENT_UTIL_TARGETS=gstat gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
>++
>++Physical_IO_Module=os/posix/unix.cpp
>++# This is needed due to broken port of gcc
>++STATIC_CXXSUPPORT_LIB = -lstdc++ -lgcc_s
>
>
>--- /dev/null
>+++ files/patch-configure
>@@ -0,0 +1,23 @@
>+--- configure.orig	2015-01-26 11:36:59.058272399 +0100
>++++ configure	2015-01-26 15:21:38.553343523 +0100
>+@@ -2454,6 +2454,20 @@
>+     SHRLIB_EXT=so
>+     ;;
>+ 
>++  arm*-*-freebsd*)
>++    MAKEFILE_PREFIX=freebsd_arm
>++    INSTALL_PREFIX=freebsd
>++    PLATFORM=FREEBSD
>++    #ATOMIC_LIBS=-latomic_ops
>++
>++cat >>confdefs.h <<\_ACEOF
>++#define FREEBSD 1
>++_ACEOF
>++
>++    EDITLINE_FLG=Y
>++    SHRLIB_EXT=so
>++    ;;
>++
>+   *-gentoo-freebsd*)
>+     MAKEFILE_PREFIX=freebsd
>+     PLATFORM=GENTOOFREEBSD
>
>
>--- /dev/null
>+++ files/patch-configure.in
>@@ -0,0 +1,19 @@
>+--- configure.in.orig	2014-12-04 12:18:19.000000000 +0100
>++++ configure.in	2015-01-26 15:19:52.944351078 +0100
>+@@ -140,6 +140,16 @@
>+     SHRLIB_EXT=so
>+     ;;
>+ 
>++  arm*-*-freebsd*)
>++    MAKEFILE_PREFIX=freebsd_arm
>++    INSTALL_PREFIX=freebsd
>++    PLATFORM=FREEBSD
>++    #ATOMIC_LIBS=-latomic_ops
>++    AC_DEFINE(FREEBSD, 1, [Define this if OS is FreeBSD])
>++    EDITLINE_FLG=Y
>++    SHRLIB_EXT=so
>++    ;;
>++
>+   *-gentoo-freebsd*)
>+     MAKEFILE_PREFIX=freebsd
>+     PLATFORM=GENTOOFREEBSD
>
>
>
>--- /dev/null
>+++ firebird25-server/files/patch-src_jrd_common.h
>@@ -0,0 +1,18 @@
>+--- src/jrd/common.h.orig	2014-12-04 11:18:19 UTC
>++++ src/jrd/common.h
>+@@ -259,10 +259,14 @@
>+ 
>+ #ifdef AMD64
>+ #define IMPLEMENTATION  isc_info_db_impl_freebsd_amd64 /* 67 */
>+-#else
>++#endif
>++#ifdef i386
>+ #define I386
>+ #define IMPLEMENTATION    isc_info_db_impl_freebsd   /* 61 */
>+ #endif
>++#ifdef ARM
>++#define IMPLEMENTATION  isc_info_db_impl_freebsd_arm	// 85
>++#endif /* ARM */
>+ 
>+ #define QUADFORMAT "ll"
>+ #define QUADCONST(n) (n##LL)
>
>
>
>--- /dev/null
>+++ files/patch-src_jrd_inf__pub.h
>@@ -0,0 +1,11 @@
>+--- src/jrd/inf_pub.h.orig	2014-12-04 11:18:19 UTC
>++++ src/jrd/inf_pub.h
>+@@ -217,6 +217,8 @@ enum  info_db_implementations
>+ 	isc_info_db_impl_linux_alpha = 83,
>+ 	isc_info_db_impl_linux_arm64 = 84,
>+ 
>++	isc_info_db_impl_freebsd_arm = 85,
>++
>+ 	isc_info_db_impl_last_value   // Leave this LAST!
>+ };
>+ 
>
>--- /dev/null
>+++ files/patch-src_jrd_pag.cpp
>@@ -0,0 +1,33 @@
>+--- src/jrd/pag.cpp.orig	2014-12-04 11:18:23 UTC
>++++ src/jrd/pag.cpp
>+@@ -164,9 +164,10 @@ static const int CLASS_LINUX_SHEB = 39;	
>+ static const int CLASS_LINUX_HPPA = 40;		// LINUX/HPPA
>+ static const int CLASS_LINUX_ALPHA = 41;	// LINUX/ALPHA
>+ static const int CLASS_LINUX_ARM64 = 42;	// LINUX/ARM64
>++static const int CLASS_FREEBSD_ARM = 43;	// FREEBSD/ARM
>+ 
>+ 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_ARM64;
>++static const int CLASS_MAX = CLASS_FREEBSD_ARM;
>+ 
>+ // ARCHITECTURE COMPATIBILITY CLASSES
>+ 
>+@@ -266,7 +267,8 @@ static const ArchitectureType archMatrix
>+ 	archBigEndian,    // CLASS_LINUX_SHEB
>+ 	archBigEndian,    // CLASS_LINUX_HPPA
>+ 	archLittleEndian, // CLASS_LINUX_ALPHA
>+-	archLittleEndian  // CLASS_LINUX_ARM64
>++	archLittleEndian, // CLASS_LINUX_ARM64
>++	archLittleEndian  // CLASS_FREEBSD_ARM
>+ };
>+ 
>+ #ifdef __sun
>+@@ -342,6 +344,8 @@ const SSHORT CLASS		= CLASS_LINUX_ALPHA;
>+ const SSHORT CLASS		= CLASS_FREEBSD_I386;
>+ #elif defined(AMD64)
>+ const SSHORT CLASS		= CLASS_FREEBSD_AMD64;
>++#elif defined(ARM)
>++const SSHORT CLASS		= CLASS_FREEBSD_ARM;
>+ #else
>+ #error no support on other hardware for FreeBSD
>+ #endif

Actions: View | Diff

Attachments on bug 200147: 156689 | 157391