From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 23 21:08:27 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 053BF192 for ; Sat, 23 Feb 2013 21:08:27 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9E17035B for ; Sat, 23 Feb 2013 21:08:26 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r1NL8PAl088660 for ; Sat, 23 Feb 2013 21:08:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r1NL8KBY088087 for freebsd-gecko@freebsd.org; Sat, 23 Feb 2013 21:08:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 23 Feb 2013 21:08:20 GMT Message-Id: <201302232108.r1NL8KBY088087@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1184 - in trunk: Mk www/firefox-nightly/files www/firefox/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2013 21:08:27 -0000 Author: jbeich Date: Sat Feb 23 21:08:20 2013 New Revision: 1184 Log: drop clang 3.0 support over an error I cannot fix In file included from image/src/SVGDocumentWrapper.cpp:30: In file included from ../../../content/svg/content/src/nsSVGSVGElement.h:19: ./../../content/svg/content/src/SVGPreserveAspectRatio.h:60:16: error: use of overloaded operator '<' is ambiguous (with operand types 'uint16_t' (aka 'unsigned short') and 'mozilla::SVGAlign') if (aAlign < SVG_PRESERVEASPECTRATIO_NONE || ~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./../../content/svg/content/src/SVGPreserveAspectRatio.h:61:16: error: use of overloaded operator '>' is ambiguous (with operand types 'uint16_t' (aka 'unsigned short') and 'mozilla::SVGAlign') aAlign > SVG_PRESERVEASPECTRATIO_XMAXYMAX) ~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./../../content/svg/content/src/SVGPreserveAspectRatio.h:72:22: error: use of overloaded operator '<' is ambiguous (with operand types 'uint16_t' (aka 'unsigned short') and 'mozilla::SVGMeetOrSlice') if (aMeetOrSlice < SVG_MEETORSLICE_MEET || ~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~ ./../../content/svg/content/src/SVGPreserveAspectRatio.h:73:22: error: use of overloaded operator '>' is ambiguous (with operand types 'uint16_t' (aka 'unsigned short') and 'mozilla::SVGMeetOrSlice') aMeetOrSlice > SVG_MEETORSLICE_SLICE) ~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~ Deleted: 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:10 2013 (r1183) +++ trunk/Mk/bsd.gecko.mk Sat Feb 23 21:08:20 2013 (r1184) @@ -569,7 +569,8 @@ CPP= ${CC} -E . endif # fallback to gcc otherwise -. if ${CC} == "cc" || ${CXX} == "c++" +. if ${CC} == "cc" || ${CXX} == "c++" \ + || ${CXX} == "clang++" && ${OSVERSION} < 900507 USE_GCC?= yes . endif .endif @@ -932,10 +933,6 @@ -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 Deleted: trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp ============================================================================== --- trunk/www/firefox-nightly/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Sat Feb 23 21:08:20 2013 (r1183) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- 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. - Deleted: trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp ============================================================================== --- trunk/www/firefox/files/patch-media-libsoundtouch-src-cpu_detect_x86.cpp Sat Feb 23 21:08:20 2013 (r1183) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- 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. -