diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-07-14 00:05:33 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-07-16 18:19:10 +0200 |
commit | 7e6a07a6d2bcf50925fc499ec53216c960692f79 (patch) | |
tree | 218d4718b6e24caed96cb3b7a07d3f59ceebf106 /nss/nss-clang_os_Linux_x86_s_comments.patch | |
parent | 7cdda27c17ddb309d7473b311485b970d57562b5 (diff) |
nss: upgrade to 3.13.5
- drop nss-linux3.patch, builds out of the box on Linux 3.x now
- drop nss-string-concat.patch, was fixed upstream
- drop nss-clang_os_Linux_x86_s_comments.patch
nss-clang_os_Linux_x86_64_s_comments.patch
the invalid asm comments were fixed upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=624868
- drop nss-asm-fix.patch, fixed upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=671711
- not updated nss.patch.mingw since it looks unmaintained
- remove the setting of FREEBL_NO_DEPEND, which is
a) no longer necessary, because it will be set automatically
on Linux 2.6
b) harmful because it prevents automatic setting of FREEBL_LOWHASH,
which is necessary to prevent conflicts with system libfreebl3.so
at least on Fedora 16/17
Change-Id: Idf9338d83f9b34000068c1b8691ca3135f56dd21
Diffstat (limited to 'nss/nss-clang_os_Linux_x86_s_comments.patch')
-rw-r--r-- | nss/nss-clang_os_Linux_x86_s_comments.patch | 178 |
1 files changed, 0 insertions, 178 deletions
diff --git a/nss/nss-clang_os_Linux_x86_s_comments.patch b/nss/nss-clang_os_Linux_x86_s_comments.patch deleted file mode 100644 index 04f2a7e5e947..000000000000 --- a/nss/nss-clang_os_Linux_x86_s_comments.patch +++ /dev/null @@ -1,178 +0,0 @@ ---- misc/nss-3.12.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s 2006-12-11 09:45:30.000000000 +0000 -+++ misc/build/nss-3.12.8/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s 2012-02-18 20:48:10.702109102 +0000 -@@ -1,46 +1,46 @@ --/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- --/ --/ ***** BEGIN LICENSE BLOCK ***** --/ Version: MPL 1.1/GPL 2.0/LGPL 2.1 --/ --/ The contents of this file are subject to the Mozilla Public License Version --/ 1.1 (the "License"); you may not use this file except in compliance with --/ the License. You may obtain a copy of the License at --/ http://www.mozilla.org/MPL/ --/ --/ Software distributed under the License is distributed on an "AS IS" basis, --/ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License --/ for the specific language governing rights and limitations under the --/ License. --/ --/ The Original Code is the Netscape Portable Runtime (NSPR). --/ --/ The Initial Developer of the Original Code is --/ Netscape Communications Corporation. --/ Portions created by the Initial Developer are Copyright (C) 2000 --/ the Initial Developer. All Rights Reserved. --/ --/ Contributor(s): --/ --/ Alternatively, the contents of this file may be used under the terms of --/ either the GNU General Public License Version 2 or later (the "GPL"), or --/ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), --/ in which case the provisions of the GPL or the LGPL are applicable instead --/ of those above. If you wish to allow use of your version of this file only --/ under the terms of either the GPL or the LGPL, and not to allow others to --/ use your version of this file under the terms of the MPL, indicate your --/ decision by deleting the provisions above and replace them with the notice --/ and other provisions required by the GPL or the LGPL. If you do not delete --/ the provisions above, a recipient may use your version of this file under --/ the terms of any one of the MPL, the GPL or the LGPL. --/ --/ ***** END LICENSE BLOCK ***** -- --/ PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val) --/ --/ Atomically increment the integer pointed to by 'val' and return --/ the result of the increment. --/ -+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+# -+# ***** BEGIN LICENSE BLOCK ***** -+# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+# -+# The contents of this file are subject to the Mozilla Public License Version -+# 1.1 (the "License"); you may not use this file except in compliance with -+# the License. You may obtain a copy of the License at -+# http://www.mozilla.org/MPL/ -+# -+# Software distributed under the License is distributed on an "AS IS" basis, -+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+# for the specific language governing rights and limitations under the -+# License. -+# -+# The Original Code is the Netscape Portable Runtime (NSPR). -+# -+# The Initial Developer of the Original Code is -+# Netscape Communications Corporation. -+# Portions created by the Initial Developer are Copyright (C) 2000 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# -+# Alternatively, the contents of this file may be used under the terms of -+# either the GNU General Public License Version 2 or later (the "GPL"), or -+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+# in which case the provisions of the GPL or the LGPL are applicable instead -+# of those above. If you wish to allow use of your version of this file only -+# under the terms of either the GPL or the LGPL, and not to allow others to -+# use your version of this file under the terms of the MPL, indicate your -+# decision by deleting the provisions above and replace them with the notice -+# and other provisions required by the GPL or the LGPL. If you do not delete -+# the provisions above, a recipient may use your version of this file under -+# the terms of any one of the MPL, the GPL or the LGPL. -+# -+# ***** END LICENSE BLOCK ***** -+ -+# PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val) -+# -+# Atomically increment the integer pointed to by 'val' and return -+# the result of the increment. -+ - .text - .globl _PR_x86_AtomicIncrement - .align 4 -@@ -52,11 +52,11 @@ - incl %eax - ret - --/ PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val) --/ --/ Atomically decrement the integer pointed to by 'val' and return --/ the result of the decrement. --/ -+# PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val) -+# -+# Atomically decrement the integer pointed to by 'val' and return -+# the result of the decrement. -+ - .text - .globl _PR_x86_AtomicDecrement - .align 4 -@@ -68,25 +68,25 @@ - decl %eax - ret - --/ PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval) --/ --/ Atomically set the integer pointed to by 'val' to the new --/ value 'newval' and return the old value. --/ --/ An alternative implementation: --/ .text --/ .globl _PR_x86_AtomicSet --/ .align 4 --/_PR_x86_AtomicSet: --/ movl 4(%esp), %ecx --/ movl 8(%esp), %edx --/ movl (%ecx), %eax --/retry: --/ lock --/ cmpxchgl %edx, (%ecx) --/ jne retry --/ ret --/ -+# PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval) -+# -+# Atomically set the integer pointed to by 'val' to the new -+# value 'newval' and return the old value. -+# -+# An alternative implementation: -+# .text -+# .globl _PR_x86_AtomicSet -+# .align 4 -+#_PR_x86_AtomicSet: -+# movl 4(%esp), %ecx -+# movl 8(%esp), %edx -+# movl (%ecx), %eax -+#retry: -+# lock -+# cmpxchgl %edx, (%ecx) -+# jne retry -+# ret -+ - .text - .globl _PR_x86_AtomicSet - .align 4 -@@ -96,11 +96,11 @@ - xchgl %eax, (%ecx) - ret - --/ PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val) --/ --/ Atomically add 'val' to the integer pointed to by 'ptr' --/ and return the result of the addition. --/ -+# PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val) -+# -+# Atomically add 'val' to the integer pointed to by 'ptr' -+# and return the result of the addition. -+ - .text - .globl _PR_x86_AtomicAdd - .align 4 -@@ -113,5 +113,5 @@ - addl %edx, %eax - ret - --/ Magic indicating no need for an executable stack -+# Magic indicating no need for an executable stack - .section .note.GNU-stack, "", @progbits ; .previous |