mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 03:31:05 +00:00
tests/check/: Decide which header to include based on the userland ABI target and not the kernel/cpu. Fix up structur...
Original commit message from CVS: Patch by: Alexis Ballier <aballier at gentoo org> * tests/check/gst/gstabi.c: * tests/check/gst/struct_ppc64.h: * tests/check/libs/libsabi.c: * tests/check/libs/struct_ppc64.h: Decide which header to include based on the userland ABI target and not the kernel/cpu. Fix up structure sizes of ppc64 header for 64-bit userland (#503590). Might need something similar for x86 too.
This commit is contained in:
Alexis Ballier
Tim-Philipp Müller
parent
2e628be2c2
commit
91a59d5af5
5 changed files with 135 additions and 100 deletions
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
||||||
|
2008-01-07 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
|
Patch by: Alexis Ballier <aballier at gentoo org>
|
||||||
|
|
||||||
|
* tests/check/gst/gstabi.c:
|
||||||
|
* tests/check/gst/struct_ppc64.h:
|
||||||
|
* tests/check/libs/libsabi.c:
|
||||||
|
* tests/check/libs/struct_ppc64.h:
|
||||||
|
Decide which header to include based on the userland ABI target
|
||||||
|
and not the kernel/cpu. Fix up structure sizes of ppc64 header
|
||||||
|
for 64-bit userland (#503590). Might need something similar for
|
||||||
|
x86 too.
|
||||||
|
|
||||||
2008-01-05 Tim-Philipp Müller <tim at centricular dot net>
|
2008-01-05 Tim-Philipp Müller <tim at centricular dot net>
|
||||||
|
|
||||||
* gst/gstdebugutils.c: (_gst_debug_bin_to_dot_file):
|
* gst/gstdebugutils.c: (_gst_debug_bin_to_dot_file):
|
||||||
|
|
|
||||||
|
|
@ -26,12 +26,12 @@
|
||||||
#include "struct_i386.h"
|
#include "struct_i386.h"
|
||||||
#define HAVE_ABI_SIZES TRUE
|
#define HAVE_ABI_SIZES TRUE
|
||||||
#else
|
#else
|
||||||
#ifdef HAVE_CPU_PPC
|
#ifdef __powerpc64__
|
||||||
#include "struct_ppc32.h"
|
#include "struct_ppc64.h"
|
||||||
#define HAVE_ABI_SIZES TRUE
|
#define HAVE_ABI_SIZES TRUE
|
||||||
#else
|
#else
|
||||||
#ifdef HAVE_CPU_PPC64
|
#ifdef __powerpc__
|
||||||
#include "struct_ppc64.h"
|
#include "struct_ppc32.h"
|
||||||
#define HAVE_ABI_SIZES TRUE
|
#define HAVE_ABI_SIZES TRUE
|
||||||
#else
|
#else
|
||||||
#ifdef HAVE_CPU_X86_64
|
#ifdef HAVE_CPU_X86_64
|
||||||
|
|
|
||||||
|
|
@ -1,75 +1,75 @@
|
||||||
GstCheckABIStruct list[] = {
|
GstCheckABIStruct list[] = {
|
||||||
{"GstBin", sizeof (GstBin), 192},
|
{"GstBin", sizeof (GstBin), 336},
|
||||||
{"GstBinClass", sizeof (GstBinClass), 288},
|
{"GstBinClass", sizeof (GstBinClass), 568},
|
||||||
{"GstBuffer", sizeof (GstBuffer), 88},
|
{"GstBuffer", sizeof (GstBuffer), 120} ,
|
||||||
{"GstBufferClass", sizeof (GstBufferClass), 16},
|
{"GstBufferClass", sizeof (GstBufferClass), 32} ,
|
||||||
{"GstBus", sizeof (GstBus), 80},
|
{"GstBus", sizeof (GstBus), 152} ,
|
||||||
{"GstBusClass", sizeof (GstBusClass), 144},
|
{"GstBusClass", sizeof (GstBusClass), 288} ,
|
||||||
{"GstCaps", sizeof (GstCaps), 32},
|
{"GstCaps", sizeof (GstCaps), 56} ,
|
||||||
{"GstStaticCaps", sizeof (GstStaticCaps), 52},
|
{"GstStaticCaps", sizeof (GstStaticCaps), 96} ,
|
||||||
{"GstChildProxyInterface", sizeof (GstChildProxyInterface), 40},
|
{"GstChildProxyInterface", sizeof (GstChildProxyInterface), 80} ,
|
||||||
{"GstClockEntry", sizeof (GstClockEntry), 48},
|
{"GstClockEntry", sizeof (GstClockEntry), 64} ,
|
||||||
{"GstClock", sizeof (GstClock), 176},
|
{"GstClock", sizeof (GstClock), 240} ,
|
||||||
{"GstClockClass", sizeof (GstClockClass), 160},
|
{"GstClockClass", sizeof (GstClockClass), 320} ,
|
||||||
{"GstElement", sizeof (GstElement), 136},
|
{"GstElement", sizeof (GstElement), 232} ,
|
||||||
{"GstElementClass", sizeof (GstElementClass), 248},
|
{"GstElementClass", sizeof (GstElementClass), 488} ,
|
||||||
{"GstElementFactory", sizeof (GstElementFactory), 144},
|
{"GstElementFactory", sizeof (GstElementFactory), 280} ,
|
||||||
{"GstElementFactoryClass", sizeof (GstElementFactoryClass), 152},
|
{"GstElementFactoryClass", sizeof (GstElementFactoryClass), 304} ,
|
||||||
{"GstElementDetails", sizeof (GstElementDetails), 32},
|
{"GstElementDetails", sizeof (GstElementDetails), 64} ,
|
||||||
{"GstEvent", sizeof (GstEvent), 48},
|
{"GstEvent", sizeof (GstEvent), 64} ,
|
||||||
{"GstEventClass", sizeof (GstEventClass), 32},
|
{"GstEventClass", sizeof (GstEventClass), 64} ,
|
||||||
{"GstFormatDefinition", sizeof (GstFormatDefinition), 16},
|
{"GstFormatDefinition", sizeof (GstFormatDefinition), 32} ,
|
||||||
{"GstIndexEntry", sizeof (GstIndexEntry), 20},
|
{"GstIndexEntry", sizeof (GstIndexEntry), 32} ,
|
||||||
{"GstIndexGroup", sizeof (GstIndexGroup), 16},
|
{"GstIndexGroup", sizeof (GstIndexGroup), 24} ,
|
||||||
{"GstIndex", sizeof (GstIndex), 100},
|
{"GstIndex", sizeof (GstIndex), 192} ,
|
||||||
{"GstIndexClass", sizeof (GstIndexClass), 156},
|
{"GstIndexClass", sizeof (GstIndexClass), 312} ,
|
||||||
{"GstIndexAssociation", sizeof (GstIndexAssociation), 16},
|
{"GstIndexAssociation", sizeof (GstIndexAssociation), 16} ,
|
||||||
{"GstIndexFactory", sizeof (GstIndexFactory), 96},
|
{"GstIndexFactory", sizeof (GstIndexFactory), 192} ,
|
||||||
{"GstIndexFactoryClass", sizeof (GstIndexFactoryClass), 152},
|
{"GstIndexFactoryClass", sizeof (GstIndexFactoryClass), 304} ,
|
||||||
{"GstDebugCategory", sizeof (GstDebugCategory), 16},
|
{"GstDebugCategory", sizeof (GstDebugCategory), 24} ,
|
||||||
{"GstImplementsInterfaceClass", sizeof (GstImplementsInterfaceClass), 28},
|
{"GstImplementsInterfaceClass", sizeof (GstImplementsInterfaceClass), 56} ,
|
||||||
{"GstIterator", sizeof (GstIterator), 52},
|
{"GstIterator", sizeof (GstIterator), 104} ,
|
||||||
{"GstMessage", sizeof (GstMessage), 64},
|
{"GstMessage", sizeof (GstMessage), 104} ,
|
||||||
{"GstMessageClass", sizeof (GstMessageClass), 32},
|
{"GstMessageClass", sizeof (GstMessageClass), 64} ,
|
||||||
{"GstMiniObject", sizeof (GstMiniObject), 16},
|
{"GstMiniObject", sizeof (GstMiniObject), 24} ,
|
||||||
{"GstMiniObjectClass", sizeof (GstMiniObjectClass), 16},
|
{"GstMiniObjectClass", sizeof (GstMiniObjectClass), 32} ,
|
||||||
{"GstObject", sizeof (GstObject), 40},
|
{"GstObject", sizeof (GstObject), 80} ,
|
||||||
{"GstObjectClass", sizeof (GstObjectClass), 120},
|
{"GstObjectClass", sizeof (GstObjectClass), 240} ,
|
||||||
{"GstPad", sizeof (GstPad), 188},
|
{"GstPad", sizeof (GstPad), 368} ,
|
||||||
{"GstPadClass", sizeof (GstPadClass), 152},
|
{"GstPadClass", sizeof (GstPadClass), 304} ,
|
||||||
{"GstPadTemplate", sizeof (GstPadTemplate), 72},
|
{"GstPadTemplate", sizeof (GstPadTemplate), 136} ,
|
||||||
{"GstPadTemplateClass", sizeof (GstPadTemplateClass), 140},
|
{"GstPadTemplateClass", sizeof (GstPadTemplateClass), 280} ,
|
||||||
{"GstStaticPadTemplate", sizeof (GstStaticPadTemplate), 64},
|
{"GstStaticPadTemplate", sizeof (GstStaticPadTemplate), 112} ,
|
||||||
{"GstPipeline", sizeof (GstPipeline), 232},
|
{"GstPipeline", sizeof (GstPipeline), 392} ,
|
||||||
{"GstPipelineClass", sizeof (GstPipelineClass), 304},
|
{"GstPipelineClass", sizeof (GstPipelineClass), 600} ,
|
||||||
{"GstPlugin", sizeof (GstPlugin), 152},
|
{"GstPlugin", sizeof (GstPlugin), 280} ,
|
||||||
{"GstPluginClass", sizeof (GstPluginClass), 136},
|
{"GstPluginClass", sizeof (GstPluginClass), 272} ,
|
||||||
{"GstPluginDesc", sizeof (GstPluginDesc), 56},
|
{"GstPluginDesc", sizeof (GstPluginDesc), 104} ,
|
||||||
{"GstPluginFeature", sizeof (GstPluginFeature), 72},
|
{"GstPluginFeature", sizeof (GstPluginFeature), 144} ,
|
||||||
{"GstPluginFeatureClass", sizeof (GstPluginFeatureClass), 136},
|
{"GstPluginFeatureClass", sizeof (GstPluginFeatureClass), 272} ,
|
||||||
{"GstQueryTypeDefinition", sizeof (GstQueryTypeDefinition), 16},
|
{"GstQueryTypeDefinition", sizeof (GstQueryTypeDefinition), 32} ,
|
||||||
{"GstQuery", sizeof (GstQuery), 28},
|
{"GstQuery", sizeof (GstQuery), 48} ,
|
||||||
{"GstQueryClass", sizeof (GstQueryClass), 32},
|
{"GstQueryClass", sizeof (GstQueryClass), 64} ,
|
||||||
{"GstRegistry", sizeof (GstRegistry), 72},
|
{"GstRegistry", sizeof (GstRegistry), 144} ,
|
||||||
{"GstRegistryClass", sizeof (GstRegistryClass), 144},
|
{"GstRegistryClass", sizeof (GstRegistryClass), 288} ,
|
||||||
{"GstSegment", sizeof (GstSegment), 88},
|
{"GstSegment", sizeof (GstSegment), 104} ,
|
||||||
{"GstStructure", sizeof (GstStructure), 20},
|
{"GstStructure", sizeof (GstStructure), 40} ,
|
||||||
{"GstSystemClock", sizeof (GstSystemClock), 200},
|
{"GstSystemClock", sizeof (GstSystemClock), 288} ,
|
||||||
{"GstSystemClockClass", sizeof (GstSystemClockClass), 176},
|
{"GstSystemClockClass", sizeof (GstSystemClockClass), 352} ,
|
||||||
{"GstTagSetterIFace", sizeof (GstTagSetterIFace), 8},
|
{"GstTagSetterIFace", sizeof (GstTagSetterIFace), 16} ,
|
||||||
{"GstTask", sizeof (GstTask), 80},
|
{"GstTask", sizeof (GstTask), 160} ,
|
||||||
{"GstTaskClass", sizeof (GstTaskClass), 140},
|
{"GstTaskClass", sizeof (GstTaskClass), 280} ,
|
||||||
{"GstTrace", sizeof (GstTrace), 20},
|
{"GstTrace", sizeof (GstTrace), 32} ,
|
||||||
{"GstTraceEntry", sizeof (GstTraceEntry), 128},
|
{"GstTraceEntry", sizeof (GstTraceEntry), 128} ,
|
||||||
{"GstAllocTrace", sizeof (GstAllocTrace), 16},
|
{"GstAllocTrace", sizeof (GstAllocTrace), 24} ,
|
||||||
{"GstTypeFind", sizeof (GstTypeFind), 32},
|
{"GstTypeFind", sizeof (GstTypeFind), 64} ,
|
||||||
{"GstTypeFindFactory", sizeof (GstTypeFindFactory), 108},
|
{"GstTypeFindFactory", sizeof (GstTypeFindFactory), 216} ,
|
||||||
{"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 152},
|
{"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 304} ,
|
||||||
{"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 44},
|
{"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 88} ,
|
||||||
{"GstValueTable", sizeof (GstValueTable), 32},
|
{"GstValueTable", sizeof (GstValueTable), 64} ,
|
||||||
#ifndef GST_DISABLE_LOADSAVE
|
#ifndef GST_DISABLE_LOADSAVE
|
||||||
{"GstXML", sizeof (GstXML), 64},
|
{"GstXML", sizeof (GstXML), 128} ,
|
||||||
{"GstXMLClass", sizeof (GstXMLClass), 144},
|
{"GstXMLClass", sizeof (GstXMLClass), 288} ,
|
||||||
#endif
|
#endif
|
||||||
{NULL, 0, 0}
|
{NULL, 0, 0}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -39,12 +39,12 @@
|
||||||
#include "struct_i386.h"
|
#include "struct_i386.h"
|
||||||
#define HAVE_ABI_SIZES TRUE
|
#define HAVE_ABI_SIZES TRUE
|
||||||
#else
|
#else
|
||||||
#ifdef HAVE_CPU_PPC
|
#ifdef __powerpc64__
|
||||||
#include "struct_ppc32.h"
|
#include "struct_ppc64.h"
|
||||||
#define HAVE_ABI_SIZES TRUE
|
#define HAVE_ABI_SIZES TRUE
|
||||||
#else
|
#else
|
||||||
#ifdef HAVE_CPU_PPC64
|
#ifdef __powerpc__
|
||||||
#include "struct_ppc64.h"
|
#include "struct_ppc32.h"
|
||||||
#define HAVE_ABI_SIZES TRUE
|
#define HAVE_ABI_SIZES TRUE
|
||||||
#else
|
#else
|
||||||
#ifdef HAVE_CPU_X86_64
|
#ifdef HAVE_CPU_X86_64
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,47 @@
|
||||||
GstCheckABIStruct list[] = {
|
GstCheckABIStruct list[] = {
|
||||||
{"GstAdapter", sizeof (GstAdapter), 52},
|
{"GstAdapter", sizeof (GstAdapter), 88}
|
||||||
{"GstAdapterClass", sizeof (GstAdapterClass), 84},
|
,
|
||||||
{"GstBaseSink", sizeof (GstBaseSink), 408},
|
{"GstAdapterClass", sizeof (GstAdapterClass), 168}
|
||||||
{"GstBaseSinkClass", sizeof (GstBaseSinkClass), 368},
|
,
|
||||||
{"GstBaseSrc", sizeof (GstBaseSrc), 392},
|
{"GstBaseSink", sizeof (GstBaseSink), 600}
|
||||||
{"GstBaseSrcClass", sizeof (GstBaseSrcClass), 376},
|
,
|
||||||
{"GstBaseTransform", sizeof (GstBaseTransform), 368},
|
{"GstBaseSinkClass", sizeof (GstBaseSinkClass), 728}
|
||||||
{"GstBaseTransformClass", sizeof (GstBaseTransformClass), 376},
|
,
|
||||||
{"GstCollectData", sizeof (GstCollectData), 120},
|
{"GstBaseSrc", sizeof (GstBaseSrc), 600}
|
||||||
{"GstCollectPads", sizeof (GstCollectPads), 92},
|
,
|
||||||
{"GstCollectPadsClass", sizeof (GstCollectPadsClass), 136},
|
{"GstBaseSrcClass", sizeof (GstBaseSrcClass), 744}
|
||||||
{"GstPushSrc", sizeof (GstPushSrc), 408},
|
,
|
||||||
{"GstPushSrcClass", sizeof (GstPushSrcClass), 396},
|
{"GstBaseTransform", sizeof (GstBaseTransform), 576}
|
||||||
{"GstTimedValue", sizeof (GstTimedValue), 32},
|
,
|
||||||
{"GstValueArray", sizeof (GstValueArray), 24},
|
{"GstBaseTransformClass", sizeof (GstBaseTransformClass), 744}
|
||||||
{"GstController", sizeof (GstController), 40},
|
,
|
||||||
{"GstControllerClass", sizeof (GstControllerClass), 84},
|
{"GstCollectData", sizeof (GstCollectData), 168}
|
||||||
{"GstNetClientClock", sizeof (GstNetClientClock), 256},
|
,
|
||||||
{"GstNetClientClockClass", sizeof (GstNetClientClockClass), 192},
|
{"GstCollectPads", sizeof (GstCollectPads), 168}
|
||||||
{"GstNetTimePacket", sizeof (GstNetTimePacket), 16},
|
,
|
||||||
{"GstNetTimeProvider", sizeof (GstNetTimeProvider), 84},
|
{"GstCollectPadsClass", sizeof (GstCollectPadsClass), 272}
|
||||||
{"GstNetTimeProviderClass", sizeof (GstNetTimeProviderClass), 120},
|
,
|
||||||
|
{"GstPushSrc", sizeof (GstPushSrc), 632}
|
||||||
|
,
|
||||||
|
{"GstPushSrcClass", sizeof (GstPushSrcClass), 784}
|
||||||
|
,
|
||||||
|
{"GstTimedValue", sizeof (GstTimedValue), 32}
|
||||||
|
,
|
||||||
|
{"GstValueArray", sizeof (GstValueArray), 32}
|
||||||
|
,
|
||||||
|
{"GstController", sizeof (GstController), 80}
|
||||||
|
,
|
||||||
|
{"GstControllerClass", sizeof (GstControllerClass), 168}
|
||||||
|
,
|
||||||
|
{"GstNetClientClock", sizeof (GstNetClientClock), 368}
|
||||||
|
,
|
||||||
|
{"GstNetClientClockClass", sizeof (GstNetClientClockClass), 384}
|
||||||
|
,
|
||||||
|
{"GstNetTimePacket", sizeof (GstNetTimePacket), 16}
|
||||||
|
,
|
||||||
|
{"GstNetTimeProvider", sizeof (GstNetTimeProvider), 152}
|
||||||
|
,
|
||||||
|
{"GstNetTimeProviderClass", sizeof (GstNetTimeProviderClass), 240}
|
||||||
|
,
|
||||||
{NULL, 0, 0}
|
{NULL, 0, 0}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue