From c41b7a412ed45d9ce7b3e0f4a7179cb3715d4b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 6 Jun 2014 22:52:15 +0200 Subject: [PATCH] Revert "treat s390x as 64-bit arch" This reverts commit d08f6a5d82c3c1dabf6d962712c53d49c39c7ab2. --- acpica-tools-s390x.patch | 12 ------------ acpica-tools.spec | 2 -- 2 files changed, 14 deletions(-) delete mode 100644 acpica-tools-s390x.patch diff --git a/acpica-tools-s390x.patch b/acpica-tools-s390x.patch deleted file mode 100644 index 458ac04..0000000 --- a/acpica-tools-s390x.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up acpica-unix2-20140424/source/include/platform/aclinux.h.s390x acpica-unix2-20140424/source/include/platform/aclinux.h ---- acpica-unix2-20140424/source/include/platform/aclinux.h.s390x 2014-06-06 21:58:18.000000000 +0200 -+++ acpica-unix2-20140424/source/include/platform/aclinux.h 2014-06-06 21:58:32.000000000 +0200 -@@ -134,7 +134,7 @@ - #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) - - #if defined(__ia64__) || defined(__x86_64__) ||\ -- defined(__aarch64__) || defined(__PPC64__) -+ defined(__aarch64__) || defined(__PPC64__) || defined(__s390x__) - #define ACPI_MACHINE_WIDTH 64 - #define COMPILER_DEPENDENT_INT64 long - #define COMPILER_DEPENDENT_UINT64 unsigned long diff --git a/acpica-tools.spec b/acpica-tools.spec index 9ec994d..d8ca851 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -30,7 +30,6 @@ Patch3: aapits-linux.patch Patch4: asllookup-miscompare.patch Patch5: aapits-makefile.patch Patch6: re-enable-big-endian.patch -Patch7: acpica-tools-s390x.patch BuildRequires: bison patchutils flex @@ -88,7 +87,6 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch4 -p1 -b .asllookup-miscompare %patch5 -p1 -b .aapits-makefile %patch6 -p1 -b .re-enable-big-endian -%patch7 -p1 -b .s390x cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE3} iasl.1