From 643be74c4960fda382a7044b6bd1a468aa52e40e95cf40a4e5fcbc6b0713bb54 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 28 Feb 2018 15:29:43 +0000 Subject: [PATCH] Accepting request 580656 from openSUSE:Factory:RISCV - u_riscv.patch: Add support for riscv64 OBS-URL: https://build.opensuse.org/request/show/580656 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-cf-files?expand=0&rev=15 --- u_riscv.patch | 83 +++++++++++++++++++++++++++++++++++++++++++ xorg-cf-files.changes | 5 +++ xorg-cf-files.spec | 10 ++++-- 3 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 u_riscv.patch diff --git a/u_riscv.patch b/u_riscv.patch new file mode 100644 index 0000000..b08a5b3 --- /dev/null +++ b/u_riscv.patch @@ -0,0 +1,83 @@ +Author: Andreas Schwab +Subject: Add support for riscv64 +Patch-Mainline: To be upstreamed + +Index: xorg-cf-files-1.0.6/Imake.cf +=================================================================== +--- xorg-cf-files-1.0.6.orig/Imake.cf ++++ xorg-cf-files-1.0.6/Imake.cf +@@ -1037,6 +1037,11 @@ XCOMM Keep cpp from replacing path eleme + # define AArch64Architecture + # undef __aarch64__ + # endif ++# if defined(__riscv) && __riscv_xlen == 64 ++# define RiscV64Architecture ++# undef __riscv ++# undef __riscv_xlen ++# endif + #endif /* linux || __GLIBC__ */ + + #if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc)) +Index: xorg-cf-files-1.0.6/linux.cf +=================================================================== +--- xorg-cf-files-1.0.6.orig/linux.cf ++++ xorg-cf-files-1.0.6/linux.cf +@@ -578,7 +578,7 @@ InstallNamedTargetNoClobber(install,file + #define MkdirHierCmd mkdir -p + + #ifndef HaveLib64 +-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) ++# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) || defined(RiscV64Architecture) + # define HaveLib64 YES + # else + # define HaveLib64 NO +@@ -994,6 +994,15 @@ InstallNamedTargetNoClobber(install,file + # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 + #endif /* AArch64Architecture */ + ++#ifdef RiscV64Architecture ++# ifndef OptimizedCDebugFlags ++# define OptimizedCDebugFlags DefaultGcc2RiscV64Opt ++# endif ++# define LinuxMachineDefines -D__riscv -D__riscv_xlen=64 ++# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME ++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#endif /* RiscV64Architecture */ ++ + #ifndef StandardDefines + # ifdef __linux__ + # define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines +Index: xorg-cf-files-1.0.6/xfree86.cf +=================================================================== +--- xorg-cf-files-1.0.6.orig/xfree86.cf ++++ xorg-cf-files-1.0.6/xfree86.cf +@@ -2052,6 +2052,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane + # endif + #endif + ++#if HasGcc2 && defined(RiscV64Architecture) ++# ifndef DefaultGcc2RiscV64Opt ++# define DefaultGcc2RiscV64Opt -O2 GccAliasingArgs ++# endif ++#endif ++ + #ifndef DefaultGcc2DebugOpt + # define DefaultGcc2DebugOpt -g + #endif +Index: xorg-cf-files-1.0.6/xorg.cf +=================================================================== +--- xorg-cf-files-1.0.6.orig/xorg.cf ++++ xorg-cf-files-1.0.6/xorg.cf +@@ -1603,6 +1603,12 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane + # endif + #endif + ++#if HasGcc2 && defined(RiscV64Architecture) ++# ifndef DefaultGcc2RiscV64Opt ++# define DefaultGcc2RiscV64Opt -O2 GccAliasingArgs ++# endif ++#endif ++ + #ifndef DefaultGcc2DebugOpt + # define DefaultGcc2DebugOpt -g + #endif diff --git a/xorg-cf-files.changes b/xorg-cf-files.changes index b982168..d294c3f 100644 --- a/xorg-cf-files.changes +++ b/xorg-cf-files.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 13:11:08 UTC 2018 - schwab@suse.de + +- u_riscv.patch: Add support for riscv64 + ------------------------------------------------------------------- Tue Dec 22 17:40:26 UTC 2015 - tobias.johannes.klausmann@mni.thm.de diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec index 45cf5e9..ea915d2 100644 --- a/xorg-cf-files.spec +++ b/xorg-cf-files.spec @@ -1,7 +1,7 @@ # # spec file for package xorg-cf-files # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ License: MIT Group: Development/Tools/Building Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2 +Patch0: u_riscv.patch BuildRequires: font-util >= 1.1 BuildRequires: pkgconfig(xorg-macros) >= 1.4 Requires: gccmakedep @@ -51,13 +52,14 @@ converted. %prep %setup -q +%patch0 -p1 cat > host.def << EOF #define ConfigDir %_configdir #define XAppLoadDir /usr/share/X11/app-defaults #define UseSeparateConfDir NO #define ManPath /usr/share/man -%ifarch ppc64 s390x x86_64 sparc64 +%ifarch ppc64 s390x x86_64 sparc64 riscv64 #define ModuleDir /usr/lib64/xorg/modules %else #define ModuleDir /usr/lib/xorg/modules @@ -104,6 +106,10 @@ cat > host.def << EOF # define HaveLib64 NO #endif #endif +#ifdef RiscV64Architecture +#undef DefaultGcc2RiscV64Opt +#define DefaultGcc2RiscV64Opt $RPM_OPT_FLAGS -fno-strict-aliasing +#endif EOF %build