← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/firefox/gutsy

« back to all changes in this revision

Viewing changes to security/nss/lib/freebl/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Ian Jackson
  • Date: 2006-10-10 18:49:32 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20061010184932-da75izt7y0e59afq
Tags: 1.99+2.0rc2+dfsg-0ubuntu1
* New upstream version 2.0rc2.
* Fix/workaround for epiphany GtkSocket lifetype crash:
  apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814.
* Change application name to `Firefox', as requested by mdz.
  Files changed:
    - browser/locales/en-US/chrome/branding/brand.dtd
    - browser/locales/en-US/chrome/branding/brand.properties;
  New values:
    - brandShortName and brandFullName: `Bon Echo' => `Firefox'
    - vendorShortName: `Mozilla' => `Ubuntu'
* Make preferences dialogue fit again (bah!).

Show diffs side-by-side

added added

removed removed

Lines of Context:
security/nss/lib/freebl/Makefile
274
274
            # no FPU (non-VIS cpus).
275
275
            # These flags were suggested by the compiler group for building
276
276
            # with SunStudio 10.
277
 
            SOL_CFLAGS += -xO4 -xtarget=generic
 
277
            ifdef BUILD_OPT
 
278
                SOL_CFLAGS += -xO4
 
279
            endif
 
280
            SOL_CFLAGS += -xtarget=generic
278
281
            ARCHFLAG = -xarch=v8plus
279
282
            SOLARIS_AS_FLAGS = -xarch=v8plus -K PIC
280
283
        endif
283
286
            # 32-bit ABI, it uses FPU code, and 32-bit word size.
284
287
            # these flags were determined by running cc -### -fast and copying
285
288
            # the generated flag settings
286
 
            SOL_CFLAGS += -D__MATHERR_ERRNO_DONTCARE -fns -fsimple=1 -fsingle
287
 
            SOL_CFLAGS += -xalias_level=basic -xbuiltin=%all
288
 
            SOL_CFLAGS += $(FPU_TARGET_OPTIMIZER) -xdepend
289
 
            SOL_CFLAGS += -xlibmil -xmemalign=8s -xO5
 
289
            SOL_CFLAGS += -fsingle -xmemalign=8s
 
290
            ifdef BUILD_OPT
 
291
                SOL_CFLAGS += -D__MATHERR_ERRNO_DONTCARE -fsimple=1
 
292
                SOL_CFLAGS += -xalias_level=basic -xbuiltin=%all
 
293
                SOL_CFLAGS += $(FPU_TARGET_OPTIMIZER) -xdepend
 
294
                SOL_CFLAGS += -xlibmil -xO5
 
295
            endif
290
296
            ARCHFLAG = -xarch=v8plusa
291
297
            SOLARIS_AS_FLAGS = -xarch=v8plusa -K PIC
292
298
        endif
293
299
        ifdef USE_ABI64_INT
294
300
            # this builds for Sparc v9a pure 64-bit architecture,
295
301
            # no FPU (non-VIS cpus). For building with SunStudio 10.
296
 
            SOL_CFLAGS += -xO4 -xtarget=generic
 
302
            ifdef BUILD_OPT
 
303
                SOL_CFLAGS += -xO4
 
304
            endif
 
305
            SOL_CFLAGS += -xtarget=generic
297
306
            ARCHFLAG = -xarch=v9
298
307
            SOLARIS_AS_FLAGS = -xarch=v9 -K PIC
299
308
        endif
301
310
            # this builds for Sparc v9a pure 64-bit architecture
302
311
            # It uses floating point, and 32-bit word size.
303
312
            # See comment for USE_ABI32_FPU.
304
 
            SOL_CFLAGS += -D__MATHERR_ERRNO_DONTCARE -fns -fsimple=1 -fsingle
305
 
            SOL_CFLAGS += -xalias_level=basic -xbuiltin=%all
306
 
            SOL_CFLAGS += $(FPU_TARGET_OPTIMIZER) -xdepend
307
 
            SOL_CFLAGS += -xlibmil -xmemalign=8s -xO5
 
313
            SOL_CFLAGS += -fsingle -xmemalign=8s
 
314
            ifdef BUILD_OPT
 
315
                SOL_CFLAGS += -D__MATHERR_ERRNO_DONTCARE -fsimple=1
 
316
                SOL_CFLAGS += -xalias_level=basic -xbuiltin=%all
 
317
                SOL_CFLAGS += $(FPU_TARGET_OPTIMIZER) -xdepend
 
318
                SOL_CFLAGS += -xlibmil -xO5
 
319
            endif
308
320
            ARCHFLAG = -xarch=v9a
309
321
            SOLARIS_AS_FLAGS = -xarch=v9a -K PIC
310
322
        endif