r15374 - in packages/trunk/invaders/debian: . patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2015-02-12 13:04:50 +0000 (Thu, 12 Feb 2015)
New Revision: 15374

Modified:
   packages/trunk/invaders/debian/changelog
   packages/trunk/invaders/debian/patches/02-static-inline.patch
   packages/trunk/invaders/debian/patches/03-reboot-on-esc.patch
Log:
* Fix ftbfs with GCC-5 (Closes: #777915).
  + 02-static-inline.patch: Declare ins##s() and outs##s() as
    "static inline" as well.
  + 03-reboot-on-esc.patch: Declare reboot() as "static inline",
    since it calls outb() which is static inline itself.

Modified: packages/trunk/invaders/debian/changelog
===================================================================
--- packages/trunk/invaders/debian/changelog	2015-01-31 20:49:58 UTC (rev 15373)
+++ packages/trunk/invaders/debian/changelog	2015-02-12 13:04:50 UTC (rev 15374)
@@ -1,7 +1,15 @@
 invaders (1.0.0-13) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Correct Vcs-* URLs to point to anonscm.debian.org
 
+  [ Fabian Greffrath ]
+  * Fix ftbfs with GCC-5 (Closes: #777915).
+    + 02-static-inline.patch: Declare ins##s() and outs##s() as
+      "static inline" as well.
+    + 03-reboot-on-esc.patch: Declare reboot() as "static inline",
+      since it calls outb() which is static inline itself.
+
  -- Evgeni Golov <evgeni at debian.org>  Mon, 15 Jul 2013 22:21:34 +0200
 
 invaders (1.0.0-12) unstable; urgency=low

Modified: packages/trunk/invaders/debian/patches/02-static-inline.patch
===================================================================
--- packages/trunk/invaders/debian/patches/02-static-inline.patch	2015-01-31 20:49:58 UTC (rev 15373)
+++ packages/trunk/invaders/debian/patches/02-static-inline.patch	2015-02-12 13:04:50 UTC (rev 15374)
@@ -22,3 +22,18 @@
  
  #define __IN2(s,s1,s2) \
  __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
+@@ -70,12 +70,12 @@
+ __IN1(s##_p) __IN2(s,s1,"w") __FULL_SLOW_DOWN_IO : "=a" (_v) : "Nd" (port) ,##i ); return _v; } \
+ 
+ #define __INS(s) \
+-extern inline void ins##s(unsigned short port, void * addr, unsigned long count) \
++static inline void ins##s(unsigned short port, void * addr, unsigned long count) \
+ { __asm__ __volatile__ ("rep ; ins" #s \
+ : "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
+ 
+ #define __OUTS(s) \
+-extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
++static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
+ { __asm__ __volatile__ ("rep ; outs" #s \
+ : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
+ 

Modified: packages/trunk/invaders/debian/patches/03-reboot-on-esc.patch
===================================================================
--- packages/trunk/invaders/debian/patches/03-reboot-on-esc.patch	2015-01-31 20:49:58 UTC (rev 15373)
+++ packages/trunk/invaders/debian/patches/03-reboot-on-esc.patch	2015-02-12 13:04:50 UTC (rev 15374)
@@ -16,7 +16,7 @@
  
  static bool gameover, winner;
  
-+inline void reboot()
++static inline void reboot()
 +{
 +  /* tell the BIOS to do a warm start */
 +  *((unsigned short *)0x472) = 0x1234;