← Back to branch summary

~ubuntu-branches/ubuntu/vivid/oss4/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/201_arch_without_mregparm.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien NOEL
  • Date: 2012-11-19 11:47:24 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20121119114724-svu8mq7x3pk64nez
Tags: 4.2-build2007-1
http://bugs.debian.org/630737
http://bugs.debian.org/687086
http://bugs.debian.org/628876
http://bugs.debian.org/675933
http://bugs.debian.org/693657
http://bugs.debian.org/693657
http://bugs.debian.org/587191
http://bugs.debian.org/653374
* New upstream release.
* Acknowledge NMU, thanks Michael Gilbert.
* Add debian/patches/110_ld-as-needed.patch: Rearrange order of linker
  arguments to fix building with "ld --as-needed" (closes: #630737).
* Add missing dependency on dpkg-dev to oss4-dkms and oss4-source
  (closes: #687086).
* Fix typo in the changelog (closes: #628876, #675933)
* Add debian/patches/002_fix-linux-oss_native_word.patch (closes: #693657).
  Thanks to Ben Hutchings.
* Add debian/patches/003_linux-error-logging-fixes.patch (closes: #693657).
  Thanks to Ben Hutchings.
* check for /lib/modules/${kernelver}/build in addition of
  /lib/modules/${kernelver}/source (closes: #587191).
* oss4-dkms.dkms.in: fix 'CLEAN' rules (closes: #653374).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/201_arch_without_mregparm.patch
 
1
Index: oss4-4.2-build2004/setup/srcconf_linux.inc
 
2
===================================================================
 
3
--- oss4-4.2-build2004.orig/setup/srcconf_linux.inc     2011-06-14 11:33:23.000000000 -0500
 
4
+++ oss4-4.2-build2004/setup/srcconf_linux.inc  2011-06-14 11:33:24.000000000 -0500
 
5
@@ -53,7 +53,9 @@
 
6
   fprintf (f,
 
7
             "CFLAGS += -O3 -fno-common  -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding%s\n", fnsp);
 
8
 # else
 
9
-#   ifndef __arm__
 
10
+#   if defined(__arm__) || defined(__sh__) || defined(__mips__) || defined(__sparc__) || defined(__ia64__) || defined(__alpha__) || defined(__s390__) || defined(__powerpc__) || defined(__hppa__)
 
11
+  fprintf (f, "CFLAGS += -O3 -fno-common -ffreestanding%s\n", fnsp);
 
12
+#   else
 
13
   if (getenv ("NO_REGPARM") == NULL)
 
14
        {
 
15
          fprintf (f,
 
16
@@ -63,8 +65,6 @@
 
17
        {
 
18
          fprintf (f, "CFLAGS += -O3 -fno-common -ffreestanding -DNO_REGPARM%s\n", fnsp);
 
19
        }
 
20
-#   else
 
21
-  fprintf (f, "CFLAGS += -O3 -fno-common -ffreestanding%s\n", fnsp);
 
22
 #   endif
 
23
 # endif
 
24
 }