pool/Mesa
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1068141 from X11:XOrg

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1068141
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=472
This commit is contained in:
Dominique Leuenberger 2023-03-01 15:13:51 +00:00 committed by Git OBS Bridge
commit eae7144aef
12 changed files with 335 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Mesa.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Tue Feb 28 09:49:37 UTC 2023 - Fabian Vogt <fvogt@suse.com>
- Add patch to fix GLX with indirect rendering:
* n_Revert-glx-Only-compute-client-GL-extensions-for-ind.patch
-------------------------------------------------------------------
Thu Feb 23 10:26:30 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
- Update to version 23.0.0
* first stable release of 2023
- refreshed patches
* n_drirc-disable-rgb10-for-chromium-on-amd.patch
* n_stop-iris-flicker.patch
* u_dep_xcb.patch
* u_fix-build-on-ppc64le.patch
- adjusted n_no-sse2-on-ix86-except-for-intel-drivers.patch
- meson: added -Dxmlconfig=enabled to fix link errors
(missing "-lexpat")
-------------------------------------------------------------------
Fri Feb 10 14:06:56 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>

8
Mesa.spec
View File

@ -42,7 +42,7 @@
%define glamor 1
%define _name_archive mesa
%define _version 22.3.5
%define _version 23.0.0
%define with_opencl 0
%define with_rusticl 0
%define with_vulkan 0
@ -123,7 +123,7 @@
%endif
Name: Mesa%{psuffix}
Version: 22.3.5
Version: 23.0.0
Release: 0
Summary: System for rendering 3-D graphics
License: MIT
@ -138,6 +138,8 @@ Source4: manual-pages.tar.bz2
Source6: Mesa-rpmlintrc
Source7: Mesa.keyring
Patch2: n_add-Mesa-headers-again.patch
# To address https://gitlab.freedesktop.org/mesa/mesa/-/issues/8393
Patch3: n_Revert-glx-Only-compute-client-GL-extensions-for-ind.patch
# never to be upstreamed
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
Patch58: u_dep_xcb.patch
@ -780,6 +782,7 @@ programs against the XA state tracker.
rm -rf docs/README.{VMS,WIN32,OS2}
%patch2 -p1
%patch3 -p1
# no longer needed since gstreamer-plugins-vaapi 1.18.4
%if 0%{?suse_version} < 1550
%patch54 -p1
@ -820,6 +823,7 @@ egl_platforms=x11,wayland
-Degl=enabled \
-Dglx=disabled \
-Dosmesa=false \
-Dxmlconfig=enabled \
%else
-Dglvnd=true \
-Dgles1=enabled \

3
mesa-22.3.5.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9
size 17069488

BIN
mesa-22.3.5.tar.xz.sig
View File

Binary file not shown.

3
mesa-23.0.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:01f3cff3763f09e0adabcb8011e4aebc6ad48f6a4dd4bae904fe918707d253e4
size 17492236

BIN
mesa-23.0.0.tar.xz.sig Normal file
View File

Binary file not shown.

245
n_Revert-glx-Only-compute-client-GL-extensions-for-ind.patch Normal file
View File

@ -0,0 +1,245 @@
From b0a48acb467959be05008f0d2603c89d51a9c4c8 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.de>
Date: Mon, 27 Feb 2023 16:17:29 +0100
Subject: [PATCH] Revert "glx: Only compute client GL extensions for indirect
contexts"
This reverts commit b090246ad27457bc48ea8f5dbe8213f5899efa22.
---
src/glx/clientinfo.c | 10 +++++++---
src/glx/glxclient.h | 3 ++-
src/glx/glxext.c | 2 +-
src/glx/glxextensions.c | 5 +----
src/glx/glxextensions.h | 2 +-
src/glx/indirect_glx.c | 1 -
src/glx/tests/clientinfo_unittest.cpp | 28 +++++++++++++--------------
7 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/glx/clientinfo.c b/src/glx/clientinfo.c
index 31c62ad989f..a7853ff8aa3 100644
--- a/src/glx/clientinfo.c
+++ b/src/glx/clientinfo.c
@@ -28,8 +28,8 @@
#include <xcb/glx.h>
#include <X11/Xlib-xcb.h>
-void
-glxSendClientInfo(struct glx_display *glx_dpy, int screen)
+_X_HIDDEN void
+__glX_send_client_info(struct glx_display *glx_dpy)
{
const unsigned ext_length = strlen("GLX_ARB_create_context");
const unsigned prof_length = strlen("_profile");
@@ -152,7 +152,11 @@ glxSendClientInfo(struct glx_display *glx_dpy, int screen)
}
}
- gl_extension_string = __glXGetClientGLExtensionString(screen);
+ gl_extension_string = __glXGetClientGLExtensionString();
+ if (gl_extension_string == NULL) {
+ return;
+ }
+
gl_extension_length = strlen(gl_extension_string) + 1;
c = XGetXCBConnection(glx_dpy->dpy);
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index ad0f37b258a..8eda47988b4 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -706,7 +706,8 @@ extern void __glEmptyImage(struct glx_context *, GLint, GLint, GLint, GLint, GLe
extern void __glXInitVertexArrayState(struct glx_context *);
extern void __glXFreeVertexArrayState(struct glx_context *);
-extern void glxSendClientInfo(struct glx_display *glx_dpy, int screen);
+_X_HIDDEN void
+__glX_send_client_info(struct glx_display *glx_dpy);
/************************************************************************/
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index b1b98a9fadd..cc59004ccff 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -929,7 +929,7 @@ __glXInitialize(Display * dpy)
return NULL;
}
- glxSendClientInfo(dpyPriv, -1);
+ __glX_send_client_info(dpyPriv);
/* Grab the lock again and add the dispay private, unless somebody
* beat us to initializing on this display in the meantime. */
diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c
index b731042cde7..cf2d9e04fef 100644
--- a/src/glx/glxextensions.c
+++ b/src/glx/glxextensions.c
@@ -762,10 +762,7 @@ __glXCalculateUsableGLExtensions(struct glx_context * gc,
* supported by the client to the server.
*/
char *
-__glXGetClientGLExtensionString(int screen)
+__glXGetClientGLExtensionString(void)
{
- if (screen < 0)
- return strdup("");
-
return __glXGetStringFromTable(known_gl_extensions, NULL);
}
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h
index 3523998babd..78658003fb4 100644
--- a/src/glx/glxextensions.h
+++ b/src/glx/glxextensions.h
@@ -269,7 +269,7 @@ extern void __IndirectGlParseExtensionOverride(struct glx_screen *psc,
const char *override);
extern void __glXCalculateUsableGLExtensions(struct glx_context *gc,
const char *server_string);
-extern char *__glXGetClientGLExtensionString(int screen);
+extern char *__glXGetClientGLExtensionString(void);
extern GLboolean __glExtensionBitIsEnabled(struct glx_context *gc,
unsigned bit);
diff --git a/src/glx/indirect_glx.c b/src/glx/indirect_glx.c
index 80e95f6754e..ffdfec48d8b 100644
--- a/src/glx/indirect_glx.c
+++ b/src/glx/indirect_glx.c
@@ -383,7 +383,6 @@ indirect_create_screen(int screen, struct glx_display * priv)
return NULL;
glx_screen_init(psc, screen, priv);
- glxSendClientInfo(priv, screen);
psc->vtable = &indirect_screen_vtable;
return psc;
diff --git a/src/glx/tests/clientinfo_unittest.cpp b/src/glx/tests/clientinfo_unittest.cpp
index f7a147e3f7a..0202768cf11 100644
--- a/src/glx/tests/clientinfo_unittest.cpp
+++ b/src/glx/tests/clientinfo_unittest.cpp
@@ -210,7 +210,7 @@ xcb_glx_set_client_info_2arb(xcb_connection_t *c,
}
extern "C" char *
-__glXGetClientGLExtensionString(int screen)
+__glXGetClientGLExtensionString()
{
char *str = (char *) malloc(sizeof(ext));
@@ -279,7 +279,7 @@ glX_send_client_info_test::common_protocol_expected_false_test(unsigned major,
bool *value)
{
create_single_screen_display(major, minor, glx_ext);
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
EXPECT_FALSE(*value);
}
@@ -290,7 +290,7 @@ glX_send_client_info_test::common_protocol_expected_true_test(unsigned major,
bool *value)
{
create_single_screen_display(major, minor, glx_ext);
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
EXPECT_TRUE(*value);
}
@@ -494,14 +494,14 @@ TEST_F(glX_send_client_info_test, does_send_SetClientInfo2ARB_for_1_4_with_both_
TEST_F(glX_send_client_info_test, uses_correct_connection)
{
create_single_screen_display(1, 1, "");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
EXPECT_EQ((xcb_connection_t *) 0xdeadbeef, connection_used);
}
TEST_F(glX_send_client_info_test, sends_correct_gl_extension_string)
{
create_single_screen_display(1, 1, "");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
ASSERT_EQ((int) sizeof(ext), gl_ext_length);
ASSERT_NE((char *) 0, gl_ext_string);
@@ -511,7 +511,7 @@ TEST_F(glX_send_client_info_test, sends_correct_gl_extension_string)
TEST_F(glX_send_client_info_test, gl_versions_are_sane)
{
create_single_screen_display(1, 4, "GLX_ARB_create_context");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
ASSERT_NE(0, num_gl_versions);
@@ -552,7 +552,7 @@ TEST_F(glX_send_client_info_test, gl_versions_are_sane)
TEST_F(glX_send_client_info_test, gl_versions_and_profiles_are_sane)
{
create_single_screen_display(1, 4, "GLX_ARB_create_context_profile");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
ASSERT_NE(0, num_gl_versions);
@@ -621,7 +621,7 @@ TEST_F(glX_send_client_info_test, gl_versions_and_profiles_are_sane)
TEST_F(glX_send_client_info_test, glx_version_is_1_4_for_1_1)
{
create_single_screen_display(1, 1, "");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
EXPECT_EQ(1, glx_major);
EXPECT_EQ(4, glx_minor);
@@ -630,7 +630,7 @@ TEST_F(glX_send_client_info_test, glx_version_is_1_4_for_1_1)
TEST_F(glX_send_client_info_test, glx_version_is_1_4_for_1_4)
{
create_single_screen_display(1, 4, "");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
EXPECT_EQ(1, glx_major);
EXPECT_EQ(4, glx_minor);
@@ -639,7 +639,7 @@ TEST_F(glX_send_client_info_test, glx_version_is_1_4_for_1_4)
TEST_F(glX_send_client_info_test, glx_version_is_1_4_for_1_4_with_ARB_create_context)
{
create_single_screen_display(1, 4, "GLX_ARB_create_context");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
EXPECT_EQ(1, glx_major);
EXPECT_EQ(4, glx_minor);
@@ -648,7 +648,7 @@ TEST_F(glX_send_client_info_test, glx_version_is_1_4_for_1_4_with_ARB_create_con
TEST_F(glX_send_client_info_test, glx_version_is_1_4_for_1_4_with_ARB_create_context_profile)
{
create_single_screen_display(1, 4, "GLX_ARB_create_context_profile");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
EXPECT_EQ(1, glx_major);
EXPECT_EQ(4, glx_minor);
@@ -657,7 +657,7 @@ TEST_F(glX_send_client_info_test, glx_version_is_1_4_for_1_4_with_ARB_create_con
TEST_F(glX_send_client_info_test, glx_version_is_1_4_for_1_5)
{
create_single_screen_display(1, 5, "");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
EXPECT_EQ(1, glx_major);
EXPECT_EQ(4, glx_minor);
@@ -666,7 +666,7 @@ TEST_F(glX_send_client_info_test, glx_version_is_1_4_for_1_5)
TEST_F(glX_send_client_info_test, glx_extensions_has_GLX_ARB_create_context)
{
create_single_screen_display(1, 4, "GLX_ARB_create_context");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
ASSERT_NE(0, glx_ext_length);
ASSERT_NE((char *) 0, glx_ext_string);
@@ -692,7 +692,7 @@ TEST_F(glX_send_client_info_test, glx_extensions_has_GLX_ARB_create_context)
TEST_F(glX_send_client_info_test, glx_extensions_has_GLX_ARB_create_context_profile)
{
create_single_screen_display(1, 4, "GLX_ARB_create_context_profile");
- glxSendClientInfo(this->glx_dpy, -1);
+ __glX_send_client_info(this->glx_dpy);
ASSERT_NE(0, glx_ext_length);
ASSERT_NE((char *) 0, glx_ext_string);
--
2.39.2

8
n_drirc-disable-rgb10-for-chromium-on-amd.patch
View File

@ -1,8 +1,8 @@
Index: mesa-22.3.2/src/util/00-mesa-defaults.conf
Index: mesa-23.0.0/src/util/00-mesa-defaults.conf
===================================================================
--- mesa-22.3.2.orig/src/util/00-mesa-defaults.conf
+++ mesa-22.3.2/src/util/00-mesa-defaults.conf
@@ -863,6 +863,14 @@ TODO: document the other workarounds.
--- mesa-23.0.0.orig/src/util/00-mesa-defaults.conf
+++ mesa-23.0.0/src/util/00-mesa-defaults.conf
@@ -892,6 +892,14 @@ TODO: document the other workarounds.
<application name="Rocket League" executable="RocketLeague">
<option name="radeonsi_zerovram" value="true" />
</application>

60
n_no-sse2-on-ix86-except-for-intel-drivers.patch
View File

@ -1,42 +1,40 @@
Index: mesa-22.2.0/meson.build
Index: mesa-23.0.0/meson.build
===================================================================
--- mesa-22.2.0.orig/meson.build
+++ mesa-22.2.0/meson.build
@@ -1275,35 +1275,8 @@ if host_machine.system() == 'windows'
endif
endif
--- mesa-23.0.0.orig/meson.build
+++ mesa-23.0.0/meson.build
@@ -1295,35 +1295,6 @@ endif
-if host_machine.cpu_family().startswith('x86') and cc.get_argument_syntax() != 'msvc'
sse41_args = []
with_sse41 = false
-if host_machine.cpu_family().startswith('x86')
- pre_args += '-DUSE_SSE41'
- with_sse41 = true
- sse41_args = ['-msse4.1']
-
- if host_machine.cpu_family() == 'x86'
- if get_option('sse2')
- # These settings make generated GCC code match MSVC and follow
- # GCC advice on https://gcc.gnu.org/wiki/FloatingPointMath#x86note
- #
- # NOTE: We need to ensure stack is realigned given that we
- # produce shared objects, and have no control over the stack
- # alignment policy of the application. Therefore we need
- # -mstackrealign or -mincoming-stack-boundary=2.
- #
- # XXX: We could have SSE without -mstackrealign if we always used
- # __attribute__((force_align_arg_pointer)), but that's not
- # always the case.
- c_args += ['-msse2', '-mfpmath=sse', '-mstackrealign']
- else
- # GCC on x86 (not x86_64) with -msse* assumes a 16 byte aligned stack, but
- # that's not guaranteed
- sse41_args += '-mstackrealign'
- if cc.get_id() != 'msvc'
- sse41_args = ['-msse4.1']
-
- if host_machine.cpu_family() == 'x86'
- if get_option('sse2')
- # These settings make generated GCC code match MSVC and follow
- # GCC advice on https://gcc.gnu.org/wiki/FloatingPointMath#x86note
- #
- # NOTE: We need to ensure stack is realigned given that we
- # produce shared objects, and have no control over the stack
- # alignment policy of the application. Therefore we need
- # -mstackrealign or -mincoming-stack-boundary=2.
- #
- # XXX: We could have SSE without -mstackrealign if we always used
- # __attribute__((force_align_arg_pointer)), but that's not
- # always the case.
- c_args += ['-msse2', '-mfpmath=sse', '-mstackrealign']
- else
- # GCC on x86 (not x86_64) with -msse* assumes a 16 byte aligned stack, but
- # that's not guaranteed
- sse41_args += '-mstackrealign'
- endif
- endif
- endif
-else
- with_sse41 = false
- sse41_args = []
-endif
+with_sse41 = false
+sse41_args = []
# Check for GCC style atomics
dep_atomic = null_dep

10
n_stop-iris-flicker.patch
View File

@ -4,11 +4,11 @@ Date: Tue May 24 14:47:53 2022 -0400
Adjusting 'iris_batch.c' per 'https://gitlab.freedesktop.org/mesa/mesa/-/issues/5731'.
diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 71cb2096ad1..0a72d2a07c3 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -926,8 +926,7 @@ submit_batch(struct iris_batch *batch)
Index: mesa-23.0.0/src/gallium/drivers/iris/iris_batch.c
===================================================================
--- mesa-23.0.0.orig/src/gallium/drivers/iris/iris_batch.c
+++ mesa-23.0.0/src/gallium/drivers/iris/iris_batch.c
@@ -923,8 +923,7 @@ submit_batch(struct iris_batch *batch)
(struct drm_i915_gem_exec_object2) {
.handle = bo->gem_handle,
.offset = bo->address,

14
u_dep_xcb.patch
View File

@ -1,8 +1,8 @@
Index: mesa-22.3.5/meson.build
Index: mesa-23.0.0/meson.build
===================================================================
--- mesa-22.3.5.orig/meson.build
+++ mesa-22.3.5/meson.build
@@ -2141,9 +2141,11 @@ if with_platform_x11
--- mesa-23.0.0.orig/meson.build
+++ mesa-23.0.0/meson.build
@@ -2191,9 +2191,11 @@ if with_platform_x11
endif
endif
if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
@ -14,10 +14,10 @@ Index: mesa-22.3.5/meson.build
dep_xcb_dri3 = dependency('xcb-dri3')
dep_xcb_present = dependency('xcb-present')
# until xcb-dri3 has been around long enough to make a hard-dependency:
Index: mesa-22.3.5/src/loader/meson.build
Index: mesa-23.0.0/src/loader/meson.build
===================================================================
--- mesa-22.3.5.orig/src/loader/meson.build
+++ mesa-22.3.5/src/loader/meson.build
--- mesa-23.0.0.orig/src/loader/meson.build
+++ mesa-23.0.0/src/loader/meson.build
@@ -28,7 +28,7 @@ if with_platform_x11 and with_dri3
include_directories : [inc_include, inc_src],
dependencies : [

29
u_fix-build-on-ppc64le.patch
View File

@ -1,7 +1,8 @@
diff -u -r mesa-21.2.3.orig/include/CL/cl_platform.h mesa-21.2.3/include/CL/cl_platform.h
--- mesa-21.2.3.orig/include/CL/cl_platform.h 2021-10-14 12:26:03.866376943 +0200
+++ mesa-21.2.3/include/CL/cl_platform.h 2021-10-14 20:37:44.557384820 +0200
@@ -356,7 +356,9 @@
Index: mesa-23.0.0/include/CL/cl_platform.h
===================================================================
--- mesa-23.0.0.orig/include/CL/cl_platform.h
+++ mesa-23.0.0/include/CL/cl_platform.h
@@ -385,7 +385,9 @@ typedef unsigned int cl_GLenum;
/* Define basic vector types */
#if defined( __VEC__ )
#if !defined(__clang__)
@ -11,10 +12,11 @@ diff -u -r mesa-21.2.3.orig/include/CL/cl_platform.h mesa-21.2.3/include/CL/cl_p
#endif
typedef __vector unsigned char __cl_uchar16;
typedef __vector signed char __cl_char16;
diff -u -r mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_rast_tri.c
--- mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c 2021-10-14 12:26:04.058380655 +0200
+++ mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_rast_tri.c 2021-10-14 20:38:55.478734888 +0200
@@ -465,7 +465,9 @@
Index: mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_rast_tri.c
===================================================================
--- mesa-23.0.0.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c
+++ mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_rast_tri.c
@@ -488,7 +488,9 @@ lp_rast_triangle_32_3_4(struct lp_raster
#if defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN
@ -24,11 +26,12 @@ diff -u -r mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_rast_tri.c mesa-21.2
#include "util/u_pwr8.h"
static inline void
diff -u -r mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_setup_tri.c
--- mesa-21.2.3.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c 2021-10-14 12:26:04.058380655 +0200
+++ mesa-21.2.3/src/gallium/drivers/llvmpipe/lp_setup_tri.c 2021-10-14 20:38:24.766150222 +0200
@@ -47,7 +47,9 @@
#if defined(PIPE_ARCH_SSE)
Index: mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_setup_tri.c
===================================================================
--- mesa-23.0.0.orig/src/gallium/drivers/llvmpipe/lp_setup_tri.c
+++ mesa-23.0.0/src/gallium/drivers/llvmpipe/lp_setup_tri.c
@@ -46,7 +46,9 @@
#if DETECT_ARCH_SSE
#include <emmintrin.h>
#elif defined(_ARCH_PWR8) && UTIL_ARCH_LITTLE_ENDIAN
+#ifndef __cplusplus