[SVN-Commit] r1185 - in trunk: Mk www/firefox-nightly/files www/firefox/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Feb 23 22:21:54 2013
New Revision: 1185

Log:
backout last commit, it was done prematurely (bug 827521 has a fix)

Added:
   trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp
   trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp
Modified:
   trunk/Mk/bsd.gecko.mk

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Sat Feb 23 21:08:20 2013	(r1184)
+++ trunk/Mk/bsd.gecko.mk	Sat Feb 23 22:21:54 2013	(r1185)
@@ -569,8 +569,7 @@
 CPP=			${CC} -E
 . endif
 # fallback to gcc otherwise
-. if ${CC} == "cc" || ${CXX} == "c++" \
-	|| ${CXX} == "clang++" && ${OSVERSION} < 900507
+. if ${CC} == "cc" || ${CXX} == "c++"
 USE_GCC?=		yes
 . endif
 .endif
@@ -933,6 +932,10 @@
 		-e 's|mozilla/plugins|browser_plugins|g' \
 		${MOZSRC}/xpcom/io/nsAppFileLocationProvider.cpp \
 		${MOZSRC}/toolkit/xre/nsXREDirProvider.cpp
+.if ${CXX} == "clang++" && ${OSVERSION} < 900506
+	@${GREP} -Flr -- '-mss' ${WRKSRC} | ${XARGS} \
+		${REINPLACE_CMD} -e 's/-mss/-mmmx &/'
+.endif
 .if ${MOZILLA} != "kompozer"
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${MOZSRC}/extensions/spellcheck/hunspell/src/mozHunspell.cpp

Added: trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp	Sat Feb 23 22:21:54 2013	(r1185)
@@ -0,0 +1,14 @@
+--- media/libsoundtouch/src/cpu_detect_x86.cpp~
++++ media/libsoundtouch/src/cpu_detect_x86.cpp
+@@ -101,7 +101,10 @@ uint detectCPUextensions(void)
+  
+     uint res = 0;
+  
+-#if defined(__GNUC__)
++#if defined(__clang__) && __clang_minor__ == 0
++    // No __get_cpuid() on FreeBSD 9.0 with Clang 3.0
++    return 0;
++#elif defined(__GNUC__)
+     // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
+     uint eax, ebx, ecx, edx;  // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
+ 

Added: trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp	Sat Feb 23 22:21:54 2013	(r1185)
@@ -0,0 +1,14 @@
+--- media/libsoundtouch/src/cpu_detect_x86.cpp~
++++ media/libsoundtouch/src/cpu_detect_x86.cpp
+@@ -101,7 +101,10 @@ uint detectCPUextensions(void)
+  
+     uint res = 0;
+  
+-#if defined(__GNUC__)
++#if defined(__clang__) && __clang_minor__ == 0
++    // No __get_cpuid() on FreeBSD 9.0 with Clang 3.0
++    return 0;
++#elif defined(__GNUC__)
+     // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
+     uint eax, ebx, ecx, edx;  // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
+