From 642e3b04df581c6046be20fafcf83229c5272505 Mon Sep 17 00:00:00 2001 From: Nagy Karoly Gabriel Date: Thu, 5 Feb 2015 10:23:34 +0100 Subject: [PATCH] bin86: replaced old 64bit patch. --- x86/bin86/{x86_64.patch => bin86-long.patch} | 36 +++++++++++--------- x86/bin86/bin86.desc | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) rename x86/bin86/{x86_64.patch => bin86-long.patch} (57%) diff --git a/x86/bin86/x86_64.patch b/x86/bin86/bin86-long.patch similarity index 57% rename from x86/bin86/x86_64.patch rename to x86/bin86/bin86-long.patch index efece9527..54260b975 100644 --- a/x86/bin86/x86_64.patch +++ b/x86/bin86/bin86-long.patch @@ -1,9 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../bin86/x86_64.patch -# Copyright (C) 2006 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE Project +# Filename: package/.../bin86/bin86-long.patch +# Copyright (C) 2015 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -15,20 +14,25 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- -Compile fixes x86-64 - imported from ROCK Linux. - - - Rene Rebe - -diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h ---- bin86-0.16.14-orig/ld/x86_aout.h 2004-11-07 20:07:31.506442000 +0100 -+++ bin86-0.16.14/ld/x86_aout.h 2004-11-07 20:07:41.106982496 +0100 -@@ -12,6 +12,9 @@ +--- ./ld/x86_aout.h.orig ++++ ./ld/x86_aout.h +@@ -11,17 +11,12 @@ + /* If the host isn't an x86 all bets are off, use chars. */ #if defined(i386) || defined(__BCC__) || defined(MSDOS) typedef long Long; - #define __OUT_OK 1 -+#elif defined(__x86_64__) -+typedef int Long; -+#define __OUT_OK 1 +-#define __OUT_OK 1 #else - typedef char Long[4]; + /* Beware: this will probably allow some BE hosts to generate broken files. */ +-#ifdef INT32_MAX + #include + typedef int32_t Long; +-#define __OUT_OK 1 +-#else +-typedef char Long[4]; #endif +-#endif ++#define __OUT_OK 1 + + struct exec { /* a.out header */ + unsigned char a_magic[2]; /* magic number */ + diff --git a/x86/bin86/bin86.desc b/x86/bin86/bin86.desc index b0c8be13b..425480233 100644 --- a/x86/bin86/bin86.desc +++ b/x86/bin86/bin86.desc @@ -33,4 +33,4 @@ [V] 0.16.21 [P] X ??-3-----9 102.700 -[D] 3827343395 Dev86src-0.16.21.tar.gz http://v3.sk/~lkundrak/dev86/ +[D] 1356093766 Dev86src-0.16.21.tar.gz http://v3.sk/~lkundrak/dev86/