Sun Jul 28 12:54:53 2013 UTC ()
fixes missng restore stack address.
PR pkg/47906

Bump PKGREVISION.


(obache)
diff -r1.17 -r1.18 pkgsrc/lang/g95/Makefile
diff -r1.15 -r1.16 pkgsrc/lang/g95/distinfo
diff -r0 -r1.1 pkgsrc/lang/g95/patches/patch-libf95.a-0.93_runtime_main.c
cvs diff -r1.17 -r1.18 pkgsrc/lang/g95/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/g95/Makefile 2013/06/01 14:44:01 1.17
+++ pkgsrc/lang/g95/Makefile 2013/07/28 12:54:52 1.18
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.17 2013/06/01 14:44:01 tron Exp $ 1# $NetBSD: Makefile,v 1.18 2013/07/28 12:54:52 obache Exp $
2 2
3DISTNAME= g95_source 3DISTNAME= g95_source
4PKGNAME= g95-0.93 4PKGNAME= g95-0.93
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://ftp.g95.org/v${PKGVERSION_NOREV}/ 7MASTER_SITES= http://ftp.g95.org/v${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9DISTFILES= ${DEFAULT_DISTFILES} gcc-core-${GCC_VER}.tar.bz2 9DISTFILES= ${DEFAULT_DISTFILES} gcc-core-${GCC_VER}.tar.bz2
10SITES.gcc-core-4.1.2.tar.bz2= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VER}/} 10SITES.gcc-core-4.1.2.tar.bz2= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VER}/}
11 11
12MAINTAINER= wennmach@NetBSD.org 12MAINTAINER= wennmach@NetBSD.org
13HOMEPAGE= http://www.g95.org/ 13HOMEPAGE= http://www.g95.org/
14COMMENT= Fortran 95 compiler from g95.org 14COMMENT= Fortran 95 compiler from g95.org
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17USE_TOOLS+= gmake gtar 17USE_TOOLS+= gmake gtar
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
cvs diff -r1.15 -r1.16 pkgsrc/lang/g95/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/g95/distinfo 2013/05/20 05:47:34 1.15
+++ pkgsrc/lang/g95/distinfo 2013/07/28 12:54:52 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.15 2013/05/20 05:47:34 adam Exp $ 1$NetBSD: distinfo,v 1.16 2013/07/28 12:54:52 obache Exp $
2 2
3SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff 3SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff
4RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176 4RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176
5Size (g95_source.tgz) = 1355198 bytes 5Size (g95_source.tgz) = 1355198 bytes
6SHA1 (gcc-core-4.1.2.tar.bz2) = d6875295f6df1bec4a6f4ab8f0da54bfb8d97306 6SHA1 (gcc-core-4.1.2.tar.bz2) = d6875295f6df1bec4a6f4ab8f0da54bfb8d97306
7RMD160 (gcc-core-4.1.2.tar.bz2) = 612cbd5b795f7095fb3f565e6a8eaaee82c472c5 7RMD160 (gcc-core-4.1.2.tar.bz2) = 612cbd5b795f7095fb3f565e6a8eaaee82c472c5
8Size (gcc-core-4.1.2.tar.bz2) = 17485561 bytes 8Size (gcc-core-4.1.2.tar.bz2) = 17485561 bytes
9SHA1 (patch-ab) = 74187ee99e3e383333219cbc53676c07ca03ff19 9SHA1 (patch-ab) = 74187ee99e3e383333219cbc53676c07ca03ff19
10SHA1 (patch-ac) = b20a90cc2f9078cf0048980b75fa6836da0f28a8 10SHA1 (patch-ac) = b20a90cc2f9078cf0048980b75fa6836da0f28a8
11SHA1 (patch-gcc_config.gcc) = 9da8f32372c64b1590d97e3f26aec0d5652cc959 11SHA1 (patch-gcc_config.gcc) = 9da8f32372c64b1590d97e3f26aec0d5652cc959
12SHA1 (patch-gcc_config_dragonfly-spec.h) = bf0c97caa314714542cf8cc63fdf0c73bda80511 12SHA1 (patch-gcc_config_dragonfly-spec.h) = bf0c97caa314714542cf8cc63fdf0c73bda80511
13SHA1 (patch-gcc_config_dragonfly.h) = 6d46b7b4637a20b36e19a15e1eaffdfff6638de9 13SHA1 (patch-gcc_config_dragonfly.h) = 6d46b7b4637a20b36e19a15e1eaffdfff6638de9
14SHA1 (patch-gcc_config_i386_dragonfly.h) = 7d60d29b5ae636d69650e8c412a94f7a6045f6d9 14SHA1 (patch-gcc_config_i386_dragonfly.h) = 7d60d29b5ae636d69650e8c412a94f7a6045f6d9
@@ -16,13 +16,14 @@ SHA1 (patch-gcc_config_i386_dragonfly64. @@ -16,13 +16,14 @@ SHA1 (patch-gcc_config_i386_dragonfly64.
16SHA1 (patch-gcc_config_t-dragonfly) = dd8d5919af737dfb9e3c18be9a41b4e2c6f31155 16SHA1 (patch-gcc_config_t-dragonfly) = dd8d5919af737dfb9e3c18be9a41b4e2c6f31155
17SHA1 (patch-gcc_config_t-dragonfly-thread) = ebdb58dacf0dc5d0bf2f1f1707a7c6ab29ee308c 17SHA1 (patch-gcc_config_t-dragonfly-thread) = ebdb58dacf0dc5d0bf2f1f1707a7c6ab29ee308c
18SHA1 (patch-gcc_ginclude_stddef.h) = 60f51a470e03173803b5e20b1fa4d6882e8d1fe9 18SHA1 (patch-gcc_ginclude_stddef.h) = 60f51a470e03173803b5e20b1fa4d6882e8d1fe9
19SHA1 (patch-gcc_toplev.h) = 4894b45bf0fd30de0610a36827ef1089e0ec6bd5 19SHA1 (patch-gcc_toplev.h) = 4894b45bf0fd30de0610a36827ef1089e0ec6bd5
20SHA1 (patch-libf95.a-0.92_configure) = e23998692b410acaabaf24f591b659d2b229bcca 20SHA1 (patch-libf95.a-0.92_configure) = e23998692b410acaabaf24f591b659d2b229bcca
21SHA1 (patch-libf95.a-0.92_io_atof.c) = 0c3a209815be3a97d984cb9a15ee888f93110d1d 21SHA1 (patch-libf95.a-0.92_io_atof.c) = 0c3a209815be3a97d984cb9a15ee888f93110d1d
22SHA1 (patch-libf95.a-0.93_intrinsics_dot__product10.c) = a2fe19bab2a6f719f541692fd4ef7e67766a18e5 22SHA1 (patch-libf95.a-0.93_intrinsics_dot__product10.c) = a2fe19bab2a6f719f541692fd4ef7e67766a18e5
23SHA1 (patch-libf95.a-0.93_intrinsics_matmul10.c) = 30609c3183a98610e4005fd4c0d12cccec0855a1 23SHA1 (patch-libf95.a-0.93_intrinsics_matmul10.c) = 30609c3183a98610e4005fd4c0d12cccec0855a1
24SHA1 (patch-libf95.a-0.93_intrinsics_random.c) = 5445f78b267f742a2bf711aa0f5e06683dda1a68 24SHA1 (patch-libf95.a-0.93_intrinsics_random.c) = 5445f78b267f742a2bf711aa0f5e06683dda1a68
25SHA1 (patch-libf95.a-0.93_io_read.c) = 594bcfb15e59dcaaec5a6a21a58af17e8f41eae9 25SHA1 (patch-libf95.a-0.93_io_read.c) = 594bcfb15e59dcaaec5a6a21a58af17e8f41eae9
26SHA1 (patch-libf95.a-0.93_math_ff.c) = 353121bc08a86765d18b0e6f051ba91f7e65e9c2 26SHA1 (patch-libf95.a-0.93_math_ff.c) = 353121bc08a86765d18b0e6f051ba91f7e65e9c2
27SHA1 (patch-libf95.a-0.93_math_x87.S) = d1eb02bd2358b6abb9b8dc3e32629cba540adcc4 27SHA1 (patch-libf95.a-0.93_math_x87.S) = d1eb02bd2358b6abb9b8dc3e32629cba540adcc4
28SHA1 (patch-libf95.a-0.93_quad_power16.c) = fc7375aa90ecf75bb8ba26d41739614040b16e09 28SHA1 (patch-libf95.a-0.93_quad_power16.c) = fc7375aa90ecf75bb8ba26d41739614040b16e09
 29SHA1 (patch-libf95.a-0.93_runtime_main.c) = 8b870b363c3f0d108979fe44248632b77258eb0d
File Added: pkgsrc/lang/g95/patches/patch-libf95.a-0.93_runtime_main.c
$NetBSD: patch-libf95.a-0.93_runtime_main.c,v 1.1 2013/07/28 12:54:52 obache Exp $

* fixes missing restore stack address.  PR pkg/47906

--- libf95.a-0.93/runtime/main.c.orig	2010-04-18 15:47:28.000000000 +0000
+++ libf95.a-0.93/runtime/main.c
@@ -50,9 +50,11 @@ int main(int argc, char *argv[]) {
  * unaligned. */
 
 #if HAVE_REAL_10 == 1 || HAVE_REAL_10 == 2
+    int diff;
     asm("mov %%esp, %%eax\n"
 	"and $0x04, %%eax\n"
-	"sub %%eax, %%esp\n" : : : "%eax");
+	"movl %%eax, %0\n"
+	"sub %%eax, %%esp\n" : "=r"(diff) : : "%eax");
 #endif
 
     g95_runtime_start(argc, argv);
@@ -62,5 +64,10 @@ int main(int argc, char *argv[]) {
     memory_done();
     g95_runtime_stop();
 
+#if HAVE_REAL_10 == 1 || HAVE_REAL_10 == 2
+    asm("mov %0, %%eax\n"
+	"add %%eax, %%esp\n" : : "r"(diff) : "%eax");
+#endif
+
     return 0;
 }