other/libotr 483:96296e274b8b: Tell glib to compile it's atomic ...

commits at adium.im commits at adium.im
Tue Aug 25 16:02:38 UTC 2009


details:	http://hg.adium.im/other/libotr/rev/96296e274b8b
revision:	483:96296e274b8b
author:		Stephen Holt <sholt at adium.im>
date:		Tue Aug 25 12:00:21 2009 -0400

Tell glib to compile it's atomic functions as x86_64.
Subject: other/libotr 484:4440c29cbed8: Add x86_64 to the build arch

details:	http://hg.adium.im/other/libotr/rev/4440c29cbed8
revision:	484:4440c29cbed8
author:		Stephen Holt <sholt at adium.im>
date:		Tue Aug 25 12:05:57 2009 -0400

Add x86_64 to the build arch

diffs (45 lines):

diff -r e1750916109e -r 4440c29cbed8 Libotr.xcodeproj/project.pbxproj
--- a/Libotr.xcodeproj/project.pbxproj	Fri Apr 17 21:20:50 2009 -0400
+++ b/Libotr.xcodeproj/project.pbxproj	Tue Aug 25 12:05:57 2009 -0400
@@ -1992,6 +1992,7 @@
 				ARCHS = (
 					ppc,
 					i386,
+					x86_64,
 				);
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
@@ -2015,6 +2016,7 @@
 				ARCHS = (
 					ppc,
 					i386,
+					x86_64,
 				);
 				DEAD_CODE_STRIPPING = YES;
 				GCC_DEBUGGING_SYMBOLS = full;
diff -r e1750916109e -r 4440c29cbed8 Libraries/glib/config.h
--- a/Libraries/glib/config.h	Fri Apr 17 21:20:50 2009 -0400
+++ b/Libraries/glib/config.h	Tue Aug 25 12:05:57 2009 -0400
@@ -36,8 +36,13 @@
 /* #undef G_ATOMIC_IA64 */
 
 #ifdef INTEL_BUILD
-	/* i486 atomic implementation */
-	#define G_ATOMIC_I486 1
+	#if __LP64__
+		/* x86_64 atomic implementation */
+		#define G_ATOMIC_X86_64 1
+	#else
+		/* i486 atomic implementation */
+		#define G_ATOMIC_I486 1
+	#endif
 #else
 	/* powerpc atomic implementation */
 	#define G_ATOMIC_POWERPC 1
@@ -504,4 +509,4 @@
 /* Have nl_langinfo (CODESET) */
 #undef HAVE_CODESET
 
-/* ***** ADIUM ***** End changes to automatically generated file */
\ No newline at end of file
+/* ***** ADIUM ***** End changes to automatically generated file */




More information about the commits mailing list