merge (890b39bb) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/compile-solaris-sparc-fortre→BUILD/compile-solaris-sparc-forte

+39 −0

Original line number	Diff line number	Diff line
		@@ -11,9 +11,29 @@ then
		(cd gemini && aclocal && autoheader && aclocal && automake && autoconf)
		fi


		# Assume Forte is installed in /opt/SUNWSpro

		PATH=/opt/SUNWspro/bin/:$PATH
		CC=cc CFLAGS="-Xa -fast -xO4 -native -xstrconst -mt -D_FORTREC_" \
		CXX=CC CXXFLAGS="-noex -xO4 -mt" \

		# For "optimal" code for this computer add -fast to EXTRA
		# To compile 64 bit, add -xarch=v9 to EXTRA_64_BIT

		EXTRA_64_BIT="-xarch=v9" # Remove comment to get 64 bit binaries
		EXTRA="-fast" # Remove comment to target current machine

		#
		# The following should not need to be touched
		#

		STD="-mt -D_FORTEC_ $EXTRA $EXTRA_64_BIT"
		ASFLAGS="$EXTRA_64_BIT" \
		CC=cc-5.0 CFLAGS="-Xa -xstrconst $STD" \
		CXX=CC CXXFLAGS="-noex $STD" \
		./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client

		gmake -j 4
		if [ $? = 0 ]
		then
		make test
		fi

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ miguel@hegel.local
		miguel@light.
		miguel@light.local
		monty@bitch.mysql.fi
		monty@butch.
		monty@donna.mysql.fi
		monty@hundin.mysql.fi
		monty@mashka.mysql.fi

client/mysqlbinlog.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ static void dump_remote_file(NET* net, const char* fname)
		}


		static my_bool
		extern "C" static my_bool
		get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		char *argument)
		{

configure.in

+5 −2

Original line number	Diff line number	Diff line
		@@ -72,12 +72,14 @@ case $MACHINE_TYPE in
		esac

		# Save some variables and the command line options for mysqlbug
		SAVE_ASFLAGS="$ASFLAGS"
		SAVE_CFLAGS="$CFLAGS"
		SAVE_CXXFLAGS="$CXXFLAGS"
		SAVE_LDFLAGS="$LDFLAGS"
		SAVE_CXXLDFLAGS="$CXXLDFLAGS"
		CONF_COMMAND="$0 $ac_configure_args"
		AC_SUBST(CONF_COMMAND)
		AC_SUBST(SAVE_ASFLAGS)
		AC_SUBST(SAVE_CFLAGS)
		AC_SUBST(SAVE_CXXFLAGS)
		AC_SUBST(SAVE_LDFLAGS)
		@@ -602,8 +604,9 @@ AC_ARG_ENABLE(assembler,
		AC_MSG_CHECKING(if we should use assembler functions)
		# For now we only support assembler on i386 and sparc systems
		AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386")
		AM_CONDITIONAL(ASSEMBLER_sparc, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparc")
		AM_CONDITIONAL(ASSEMBLER, test "$ASSEMBLER_x86_TRUE" = "" -o "$ASSEMBLER_sparc_TRUE" = "")
		AM_CONDITIONAL(ASSEMBLER_sparc32, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparc")
		AM_CONDITIONAL(ASSEMBLER_sparc64, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparcv9")
		AM_CONDITIONAL(ASSEMBLER, test "$ASSEMBLER_x86_TRUE" = "" -o "$ASSEMBLER_sparc32_TRUE" = "")

		if test "$ASSEMBLER_TRUE" = ""
		then

include/my_global.h

+15 −16

Original line number	Diff line number	Diff line
		@@ -38,6 +38,14 @@
		#define HAVE_ERRNO_AS_DEFINE
		#endif /* __CYGWIN__ */

		/* Macros to make switching between C and C++ mode easier */
		#ifdef __cplusplus
		#define C_MODE_START extern "C" {
		#define C_MODE_END }
		#else
		#define C_MODE_START
		#define C_MODE_END
		#endif

		#if defined(_WIN32) \|\| defined(_WIN64) \|\| defined(__WIN32__) \|\| defined(WIN32)
		#include <config-win.h>
		@@ -121,13 +129,9 @@
		/* #define _AIX32_CURSES / / XXX: this breaks AIX 4.3.3 (others?). */
		#define ulonglong2double(A) my_ulonglong2double(A)
		#define my_off_t2double(A) my_ulonglong2double(A)
		#ifdef __cplusplus
		extern "C" {
		#endif
		C_MODE_START
		double my_ulonglong2double(unsigned long long A);
		#ifdef __cplusplus
		}
		#endif
		C_MODE_END
		#endif /* _AIX */

		#ifdef HAVE_BROKEN_SNPRINTF /* HPUX 10.20 don't have this defined */
		@@ -385,7 +389,9 @@ typedef int my_socket; /* File descriptor for sockets */
		#endif
		/* Type for fuctions that handles signals */
		#define sig_handler RETSIGTYPE
		C_MODE_START
		typedef void (sig_return)();/ Returns type from signal */
		C_MODE_END
		#if defined(__GNUC__) && !defined(_lint)
		typedef char pchar; /* Mixed prototypes can take char */
		typedef char puchar; /* Mixed prototypes can take char */
		@@ -399,8 +405,10 @@ typedef int pbool; /* Mixed prototypes can't take char */
		typedef int pshort; /* Mixed prototypes can't take short int */
		typedef double pfloat; /* Mixed prototypes can't take float */
		#endif
		C_MODE_START
		typedef int (qsort_cmp)(const void ,const void *);
		typedef int (qsort_cmp2)(void, const void ,const void );
		C_MODE_END
		#ifdef HAVE_mit_thread
		#define qsort_t void
		#undef QSORT_TYPE_IS_VOID
		@@ -1038,13 +1046,4 @@ typedef union {
		#define statistic_add(V,C,L) (V)+=(C)
		#endif

		/* Macros to make switching between C and C++ mode easier */
		#ifdef __cplusplus
		#define C_MODE_START extern "C" {
		#define C_MODE_END }
		#else
		#define C_MODE_START
		#define C_MODE_END
		#endif

		#endif /* _global_h */
		#endif /* my_global_h */