Commit 2800ab31 authored by Martin Pitt's avatar Martin Pitt

Check for correct architecture identifiers for SuperH

Patch cherry-picked from upstream.

Closes: #779710
parent 58da7faf
......@@ -4,6 +4,7 @@ systemd (215-13) UNRELEASED; urgency=medium
shutdown, to provide monotonic time for reboots. (Note: this is a hack for
jessie; the next Debian release will enable timesyncd by default).
(Closes: #755722)
* Check for correct architecture identifiers for SuperH. (Closes: #779710)
-- Martin Pitt <mpitt@debian.org> Mon, 16 Feb 2015 16:11:12 +0100
......
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Thu, 5 Mar 2015 00:07:33 +0100
Subject: Use correct uname identifiers in arch_map for SuperH architecture
https://bugs.freedesktop.org/show_bug.cgi?id=89421
---
src/shared/architecture.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/shared/architecture.c b/src/shared/architecture.c
index dc45f35..617f39c 100644
--- a/src/shared/architecture.c
+++ b/src/shared/architecture.c
@@ -108,8 +108,12 @@ Architecture uname_architecture(void) {
{ "armv8l", ARCHITECTURE_ARM },
{ "armv8b", ARCHITECTURE_ARM_BE },
#elif defined(__sh__) || defined(__sh64__)
- { "sh64", ARCHITECTURE_SH64 },
- { "sh", ARCHITECTURE_SH },
+ { "sh5", ARCHITECTURE_SH64 },
+ { "sh2", ARCHITECTURE_SH },
+ { "sh2a", ARCHITECTURE_SH },
+ { "sh3", ARCHITECTURE_SH },
+ { "sh4", ARCHITECTURE_SH },
+ { "sh4a", ARCHITECTURE_SH },
#elif defined(__m68k__)
{ "m68k", ARCHITECTURE_M68K },
#elif defined(__tilegx__)
......@@ -135,6 +135,7 @@ logind-handle-closing-sessions-over-daemon-restarts.patch
logind-fix-sd_eviocrevoke-ioctl-call.patch
rules-Fix-by-path-of-mmc-RPMB-partitions-and-don-t-b.patch
man-document-failed.patch
Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch
## Debian specific patches:
Add-back-support-for-Debian-specific-config-files.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment