Mercurial Mercurial > hg > mozilla / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-arm-cpu-detection.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Thu, 15 Mar 2012 10:33:22 +0100
changeset 409 ff30593d2daa
parent 404 5f3bccaf6d52
permissions -rw-r--r--
switch to 12.0dev
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
404
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     1
 
# HG changeset patch
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     2
 
# Parent 80b3a069c028690886ade5fdeb0f5d8b435ea368
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     3
 
diff --git a/xpcom/glue/objs.mk b/xpcom/glue/objs.mk
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     4
 
--- a/xpcom/glue/objs.mk
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     5
 
+++ b/xpcom/glue/objs.mk
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     6
 
@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS =      \
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     7
 
   SSE.cpp                        \
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     8
 
   unused.cpp                     \
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
     9
 
   nsProxyRelease.cpp             \
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    10
 
   nsTextFormatter.cpp            \
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    11
 
   GenericFactory.cpp             \
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    12
 
   FileUtils.cpp                  \
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    13
 
   $(NULL)
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    14
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    15
 
-ifeq (arm,$(TARGET_CPU))
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    16
 
+ifneq (,$(filter arm%,$(TARGET_CPU)))
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    17
 
 XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    18
 
 endif
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    19
5f3bccaf6d52 provide browser(npapi)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset 
    20
 
 XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS))
mozilla