rpm/dtc
SHA256
1
0
Fork 0
forked from pool/dtc
Code Pull Requests Activity

Accepting request 224928 from home:oertel:branches:Base:System

Browse Source 
- add use-tx-as-the-type-specifier-instead-of-zx.patch
  taken from fedora to fix build on s390

OBS-URL: https://build.opensuse.org/request/show/224928
OBS-URL: https://build.opensuse.org/package/show/Base:System/dtc?expand=0&rev=17
This commit is contained in:
Marcus Meissner 2014-03-10 16:57:39 +00:00 committed by Git OBS Bridge
parent 3d89df14cc
commit e0eda58950
3 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dtc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 7 01:29:13 CET 2014 - ro@suse.de
- add use-tx-as-the-type-specifier-instead-of-zx.patch
taken from fedora to fix build on s390
-------------------------------------------------------------------
Tue Jul 9 09:26:13 UTC 2013 - dmueller@suse.com

4
dtc.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package dtc
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -29,6 +29,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: dtc-%{version}.tar.gz
Source2: baselibs.conf
Patch3: dtc-license.patch
Patch4: use-tx-as-the-type-specifier-instead-of-zx.patch
%description
PowerPC kernels are moving towards requiring a small Open
@ -60,6 +61,7 @@ This package provides development files for libfdt
%prep
%setup -q
%patch3
%patch4 -p1
%build
make %{?_smp_mflags}

57
use-tx-as-the-type-specifier-instead-of-zx.patch Normal file
View File

@ -0,0 +1,57 @@
From 46ed9702a0005da87edd0cc3d34dbe24d1526784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Thu, 6 Jun 2013 17:01:39 +0200
Subject: [PATCH] use tx as the type specifier instead of zx
A couple of printf() commands use "zx" as a type specifier for printing
a difference of 2 pointers. "z" means a size_t, but using "t" which is
ptrdiff_t is correct. The issue was found on s390 (32-bit) where size_t
is defined as "unsigned long" as opposed to the usual "unsigned int".
---
fdtdump.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fdtdump.c b/fdtdump.c
index 723770d..c5811f0 100644
--- a/fdtdump.c
+++ b/fdtdump.c
@@ -95,7 +95,7 @@ static void dump_blob(void *blob, bool debug)
p = p_struct;
while ((tag = fdt32_to_cpu(GET_CELL(p))) != FDT_END) {
- dumpf("%04zx: tag: 0x%08x (%s)\n",
+ dumpf("%04tx: tag: 0x%08x (%s)\n",
(uintptr_t)p - blob_off - 4, tag, tagname(tag));
if (tag == FDT_BEGIN_NODE) {
@@ -135,8 +135,8 @@ static void dump_blob(void *blob, bool debug)
p = PALIGN(p + sz, 4);
- dumpf("%04zx: string: %s\n", (uintptr_t)s - blob_off, s);
- dumpf("%04zx: value\n", (uintptr_t)t - blob_off);
+ dumpf("%04tx: string: %s\n", (uintptr_t)s - blob_off, s);
+ dumpf("%04tx: value\n", (uintptr_t)t - blob_off);
printf("%*s%s", depth * shift, "", s);
utilfdt_print_data(t, sz);
printf(";\n");
@@ -210,14 +210,14 @@ int main(int argc, char *argv[])
fdt_off_dt_strings(p) < this_len)
break;
if (debug)
- printf("%s: skipping fdt magic at offset %#zx\n",
+ printf("%s: skipping fdt magic at offset %#tx\n",
file, p - buf);
}
++p;
}
if (!p)
die("%s: could not locate fdt magic\n", file);
- printf("%s: found fdt at offset %#zx\n", file, p - buf);
+ printf("%s: found fdt at offset %#tx\n", file, p - buf);
buf = p;
}
--
1.8.1.4