!14 增加riscv构建支持
From: @laokz Reviewed-by: @weidongkl Signed-off-by: @weidongkl
This commit is contained in:
openeuler-ci-bot
Gitee
commit
e4a2a6e7e0
145
0002-libemf-1.0.13-add-riscv64.patch
Normal file
145
0002-libemf-1.0.13-add-riscv64.patch
Normal file
@ -0,0 +1,145 @@
|
||||
diff --git a/include/libEMF/wine/winnt.h b/include/libEMF/wine/winnt.h
|
||||
index 39e2f90..4fa061c 100644
|
||||
--- a/include/libEMF/wine/winnt.h
|
||||
+++ b/include/libEMF/wine/winnt.h
|
||||
@@ -61,6 +61,10 @@
|
||||
# define WORDS_BIGENDIAN
|
||||
# define BITFIELDS_BIGENDIAN
|
||||
# undef ALLOW_UNALIGNED_ACCESS
|
||||
+#elif defined(__riscv)
|
||||
+# undef WORDS_BIGENDIAN
|
||||
+# undef BITFIELDS_BIGENDIAN
|
||||
+# define ALLOW_UNALIGNED_ACCESS
|
||||
#elif defined(__e2k__)
|
||||
# undef WORDS_BIGENDIAN
|
||||
# undef BITFIELDS_BIGENDIAN
|
||||
@@ -480,6 +484,7 @@ typedef HANDLE *PHANDLE, *LPHANDLE;
|
||||
#define PROCESSOR_ARCHITECTURE_PPC 3
|
||||
#define PROCESSOR_ARCHITECTURE_SHX 4
|
||||
#define PROCESSOR_ARCHITECTURE_ARM 5
|
||||
+#define PROCESSOR_ARCHITECTURE_RISCV64 15
|
||||
#define PROCESSOR_ARCHITECTURE_LOONGARCH64 6
|
||||
#define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF
|
||||
|
||||
@@ -1513,6 +1518,111 @@ typedef struct _CONTEXT {
|
||||
|
||||
#endif /* __aarch64__ */
|
||||
|
||||
+/* Copied from https://github.com/AndreRH/wine/blob/73fff3508dc7edf04910ebb322d22f5cb190beec/include/winnt.h */
|
||||
+#ifdef __riscv
|
||||
+
|
||||
+#define CONTEXT_RISC64 0x800000
|
||||
+#define CONTEXT_CONTROL (CONTEXT_RISC64 | 0x00000001)
|
||||
+#define CONTEXT_INTEGER (CONTEXT_RISC64 | 0x00000002)
|
||||
+#define CONTEXT_FLOATING_POINT (CONTEXT_RISC64 | 0x00000004)
|
||||
+#define CONTEXT_DEBUG_REGISTERS (CONTEXT_RISC64 | 0x00000008)
|
||||
+
|
||||
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER)
|
||||
+#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS)
|
||||
+
|
||||
+#define EXCEPTION_READ_FAULT 0
|
||||
+#define EXCEPTION_WRITE_FAULT 1
|
||||
+#define EXCEPTION_EXECUTE_FAULT 8
|
||||
+
|
||||
+typedef struct _CONTEXT
|
||||
+{
|
||||
+ ULONG ContextFlags; /* 000 */
|
||||
+ /* CONTEXT_INTEGER */
|
||||
+ union
|
||||
+ {
|
||||
+ struct
|
||||
+ {
|
||||
+ DWORD64 X1; /* 004 */
|
||||
+ DWORD64 X2; /* 00c */
|
||||
+ DWORD64 X3; /* 014 */
|
||||
+ DWORD64 X4; /* 01c */
|
||||
+ DWORD64 X5; /* 024 */
|
||||
+ DWORD64 X6; /* 02c */
|
||||
+ DWORD64 X7; /* 034 */
|
||||
+ DWORD64 X8; /* 03c */
|
||||
+ DWORD64 X9; /* 044 */
|
||||
+ DWORD64 X10; /* 04c */
|
||||
+ DWORD64 X11; /* 054 */
|
||||
+ DWORD64 X12; /* 05c */
|
||||
+ DWORD64 X13; /* 064 */
|
||||
+ DWORD64 X14; /* 06c */
|
||||
+ DWORD64 X15; /* 074 */
|
||||
+ DWORD64 X16; /* 07c */
|
||||
+ DWORD64 X17; /* 084 */
|
||||
+ DWORD64 X18; /* 08c */
|
||||
+ DWORD64 X19; /* 094 */
|
||||
+ DWORD64 X20; /* 09c */
|
||||
+ DWORD64 X21; /* 0a4 */
|
||||
+ DWORD64 X22; /* 0ac */
|
||||
+ DWORD64 X23; /* 0b4 */
|
||||
+ DWORD64 X24; /* 0bc */
|
||||
+ DWORD64 X25; /* 0c4 */
|
||||
+ DWORD64 X26; /* 0cc */
|
||||
+ DWORD64 X27; /* 0d4 */
|
||||
+ DWORD64 X28; /* 0dc */
|
||||
+ DWORD64 X29; /* 0e4 */
|
||||
+ DWORD64 X30; /* 0ec */
|
||||
+ DWORD64 X31; /* 0f4 */
|
||||
+ } DUMMYSTRUCTNAME;
|
||||
+ DWORD64 X[31]; /* 004 */
|
||||
+ } DUMMYUNIONNAME1;
|
||||
+ /* CONTEXT_CONTROL */
|
||||
+ DWORD64 pc; /* 0fc */
|
||||
+ /* CONTEXT_FLOATING_POINT */
|
||||
+ union
|
||||
+ {
|
||||
+ struct
|
||||
+ {
|
||||
+ DWORD64 F0; /* */
|
||||
+ DWORD64 F1; /* 104 */
|
||||
+ DWORD64 F2; /* */
|
||||
+ DWORD64 F3; /* 114 */
|
||||
+ DWORD64 F4; /* */
|
||||
+ DWORD64 F5; /* 124 */
|
||||
+ DWORD64 F6; /* 12c */
|
||||
+ DWORD64 F7; /* 134 */
|
||||
+ DWORD64 F8; /* 13c */
|
||||
+ DWORD64 F9; /* 144 */
|
||||
+ DWORD64 F10; /* 14c */
|
||||
+ DWORD64 F11; /* 154 */
|
||||
+ DWORD64 F12; /* 15c */
|
||||
+ DWORD64 F13; /* 164 */
|
||||
+ DWORD64 F14; /* 16c */
|
||||
+ DWORD64 F15; /* 174 */
|
||||
+ DWORD64 F16; /* 17c */
|
||||
+ DWORD64 F17; /* 184 */
|
||||
+ DWORD64 F18; /* 18c */
|
||||
+ DWORD64 F19; /* 194 */
|
||||
+ DWORD64 F20; /* 19c */
|
||||
+ DWORD64 F21; /* 1a4 */
|
||||
+ DWORD64 F22; /* 1ac */
|
||||
+ DWORD64 F23; /* 1b4 */
|
||||
+ DWORD64 F24; /* 1bc */
|
||||
+ DWORD64 F25; /* 1c4 */
|
||||
+ DWORD64 F26; /* 1cc */
|
||||
+ DWORD64 F27; /* 1d4 */
|
||||
+ DWORD64 F28; /* 1dc */
|
||||
+ DWORD64 F29; /* 1e4 */
|
||||
+ DWORD64 F30; /* 1ec */
|
||||
+ DWORD64 F31; /* 1f4 */
|
||||
+ } DUMMYSTRUCTNAME;
|
||||
+ DWORD64 F[32]; /* 0fc */
|
||||
+ } DUMMYUNIONNAME2;
|
||||
+ /* CONTEXT_DEBUG_REGISTERS */
|
||||
+} CONTEXT;
|
||||
+
|
||||
+#endif /* __riscv */
|
||||
+
|
||||
#ifdef __e2k__
|
||||
/*
|
||||
* FIXME:
|
||||
@@ -3071,7 +3181,8 @@ typedef struct _IMAGE_VXD_HEADER {
|
||||
#define IMAGE_FILE_MACHINE_R4000 0x166
|
||||
#define IMAGE_FILE_MACHINE_R10000 0x168
|
||||
#define IMAGE_FILE_MACHINE_ALPHA 0x184
|
||||
-#define IMAGE_FILE_MACHINE_POWERPC 0x1F0
|
||||
+#define IMAGE_FILE_MACHINE_POWERPC 0x1F0
|
||||
+#define IMAGE_FILE_MACHINE_RISCV64 0x15c5
|
||||
|
||||
#define IMAGE_SIZEOF_FILE_HEADER 20
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
Name: libEMF
|
||||
Version: 1.0.13
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: A library for generating Enhanced Metafiles
|
||||
License: LGPLv2+ and GPLv2+
|
||||
URL: http://libemf.sourceforge.net/
|
||||
Source0: https://downloads.sourceforge.net/project/libemf/libemf/%{version}/libemf-%{version}.tar.gz
|
||||
Patch0: 0001-libEMF-add-loongarch64.patch
|
||||
Patch1: 0002-libemf-1.0.13-add-riscv64.patch
|
||||
|
||||
BuildRequires: gcc-c++ chrpath
|
||||
|
||||
@ -60,6 +61,10 @@ make check
|
||||
%doc doc/html/* NEWS README
|
||||
|
||||
%changelog
|
||||
* Thu Jul 20 2023 wujie <wujie@nj.iscas.ac.cn> - 1.0.13-3
|
||||
- Add riscv64 support from http://fedora.riscv.rocks/koji/buildinfo?buildID=24988
|
||||
Author is David Abdurachmanov <david.abdurachmanov@gmail.com>
|
||||
|
||||
* Wed Jul 5 2023 doupengda <doupengda@loongson.cn> - 1.0.13-2
|
||||
- libEMF add support for loongarch64
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user