Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
8b8cd431
Kaydet (Commit)
8b8cd431
authored
Şub 27, 2013
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
move generation of sal/typesizes.h to configure
Change-Id: I22d28044bde624b7cfd8537c5c1e2906cb5303fc
üst
8281578b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
57 deletions
+53
-57
config_host.mk.in
config_host.mk.in
+0
-10
config_typesizes.h.in
config_host/config_typesizes.h.in
+19
-0
configure.ac
configure.ac
+33
-31
CustomTarget_generated.mk
sal/CustomTarget_generated.mk
+1
-16
No files found.
config_host.mk.in
Dosyayı görüntüle @
8b8cd431
...
...
@@ -14,10 +14,6 @@ export BUILDDIR=@BUILDDIR@
export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@
@x_AFLAGS@ export AFLAGS=@AFLAGS@
export ALIGNOF_DOUBLE=@ALIGNOF_DOUBLE@
export ALIGNOF_INT=@ALIGNOF_INT@
export ALIGNOF_LONG=@ALIGNOF_LONG@
export ALIGNOF_SHORT=@ALIGNOF_SHORT@
export ALLOC=@ALLOC@
export ALL_LANGS=@ALL_LANGS@
export ANCIENT_BISON=@ANCIENT_BISON@
...
...
@@ -491,12 +487,6 @@ export SAL_ENABLE_FILE_LOCKING=1
export SCPDEFS=@SCPDEFS@
export SERVLETAPI_JAR=@SERVLETAPI_JAR@
export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
export SIZEOF_DOUBLE=@SIZEOF_DOUBLE@
export SIZEOF_INT=@SIZEOF_INT@
export SIZEOF_LONG=@SIZEOF_LONG@
export SIZEOF_LONGLONG=@SIZEOF_LONGLONG@
export SIZEOF_POINTER=@SIZEOF_POINTER@
export SIZEOF_SHORT=@SIZEOF_SHORT@
export SOLARENV=@SRC_ROOT@/solenv
export SOLARINC=@SOLARINC@
export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
...
...
config_host/config_typesizes.h.in
0 → 100644
Dosyayı görüntüle @
8b8cd431
/*
Alignments and sizes of types.
*/
#ifndef CONFIG_TYPESIZES_H
#define CONFIG_TYPESIZES_H
#undef SAL_TYPES_ALIGNMENT2
#undef SAL_TYPES_ALIGNMENT4
#undef SAL_TYPES_ALIGNMENT8
#undef SAL_TYPES_SIZEOFSHORT
#undef SAL_TYPES_SIZEOFINT
#undef SAL_TYPES_SIZEOFLONG
#undef SAL_TYPES_SIZEOFLONGLONG
#undef SAL_TYPES_SIZEOFPOINTER
#endif
configure.ac
Dosyayı görüntüle @
8b8cd431
...
...
@@ -5097,12 +5097,11 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
AC_CHECK_SIZEOF(double)
AC_CHECK_SIZEOF(void*)
SIZEOF_SHORT=$ac_cv_sizeof_short
SIZEOF_INT=$ac_cv_sizeof_int
SIZEOF_LONG=$ac_cv_sizeof_long
SIZEOF_LONGLONG=$ac_cv_sizeof_long_long
SIZEOF_DOUBLE=$ac_cv_sizeof_double
SIZEOF_POINTER=$ac_cv_sizeof_voidp
SAL_TYPES_SIZEOFSHORT=$ac_cv_sizeof_short
SAL_TYPES_SIZEOFINT=$ac_cv_sizeof_int
SAL_TYPES_SIZEOFLONG=$ac_cv_sizeof_long
SAL_TYPES_SIZEOFLONGLONG=$ac_cv_sizeof_long_long
SAL_TYPES_SIZEOFPOINTER=$ac_cv_sizeof_voidp
dnl Allow build without AC_CHECK_ALIGNOF, grrr
m4_pattern_allow([AC_CHECK_ALIGNOF])
...
...
@@ -5144,10 +5143,15 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
esac
])
ALIGNOF_SHORT=$ac_cv_alignof_short
ALIGNOF_INT=$ac_cv_alignof_int
ALIGNOF_LONG=$ac_cv_alignof_long
ALIGNOF_DOUBLE=$ac_cv_alignof_double
SAL_TYPES_ALIGNMENT2=$ac_cv_alignof_short
SAL_TYPES_ALIGNMENT4=$ac_cv_alignof_int
if test $ac_cv_alignof_long -eq 8; then
SAL_TYPES_ALIGNMENT8=$ac_cv_alignof_long
elif test $ac_cv_alignof_double -eq 8; then
SAL_TYPES_ALIGNMENT8=$ac_cv_alignof_double
else
AC_MSG_ERROR([Cannot find alignment of 8 byte types.])
fi
AC_C_BIGENDIAN
WORDS_BIGENDIAN=$ac_cv_c_bigendian
...
...
@@ -5162,35 +5166,32 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
fi
else
# Hardcode for MSVC
S
IZEOF_
SHORT=2
S
IZEOF_
INT=4
S
IZEOF_
LONG=4
S
IZEOF_
LONGLONG=8
S
AL_TYPES_SIZEOF
SHORT=2
S
AL_TYPES_SIZEOF
INT=4
S
AL_TYPES_SIZEOF
LONG=4
S
AL_TYPES_SIZEOF
LONGLONG=8
if test "$BITNESS_OVERRIDE" = ""; then
S
IZEOF_
POINTER=4
S
AL_TYPES_SIZEOF
POINTER=4
else
S
IZEOF_
POINTER=8
S
AL_TYPES_SIZEOF
POINTER=8
fi
ALIGNOF_SHORT=2
ALIGNOF_INT=4
ALIGNOF_LONG=4
ALIGNOF_DOUBLE=8
SAL_TYPES_ALIGNMENT2=2
SAL_TYPES_ALIGNMENT4=4
SAL_TYPES_ALIGNMENT8=8
WORDS_BIGENDIAN=no
LFS_CFLAGS=''
fi
AC_SUBST(WORDS_BIGENDIAN)
AC_SUBST(LFS_CFLAGS)
AC_SUBST(SIZEOF_SHORT)
AC_SUBST(SIZEOF_INT)
AC_SUBST(SIZEOF_LONG)
AC_SUBST(SIZEOF_LONGLONG)
AC_SUBST(SIZEOF_DOUBLE)
AC_SUBST(SIZEOF_POINTER)
AC_SUBST(ALIGNOF_SHORT)
AC_SUBST(ALIGNOF_INT)
AC_SUBST(ALIGNOF_LONG)
AC_SUBST(ALIGNOF_DOUBLE)
AC_DEFINE_UNQUOTED(SAL_TYPES_SIZEOFSHORT,$SAL_TYPES_SIZEOFSHORT)
AC_DEFINE_UNQUOTED(SAL_TYPES_SIZEOFINT,$SAL_TYPES_SIZEOFINT)
AC_DEFINE_UNQUOTED(SAL_TYPES_SIZEOFLONG,$SAL_TYPES_SIZEOFLONG)
AC_DEFINE_UNQUOTED(SAL_TYPES_SIZEOFLONGLONG,$SAL_TYPES_SIZEOFLONGLONG)
AC_DEFINE_UNQUOTED(SAL_TYPES_SIZEOFPOINTER,$SAL_TYPES_SIZEOFPOINTER)
AC_DEFINE_UNQUOTED(SAL_TYPES_ALIGNMENT2,$SAL_TYPES_ALIGNMENT2)
AC_DEFINE_UNQUOTED(SAL_TYPES_ALIGNMENT4,$SAL_TYPES_ALIGNMENT4)
AC_DEFINE_UNQUOTED(SAL_TYPES_ALIGNMENT8,$SAL_TYPES_ALIGNMENT8)
dnl ===================================================================
dnl Check if valgrind headers are available
...
...
@@ -9985,7 +9986,7 @@ AC_SUBST(RHINO_JAR)
supports_multilib=
case "$host_cpu" in
x86_64 | powerpc64 | s390x)
if test "$S
IZEOF_
LONG" = "8"; then
if test "$S
AL_TYPES_SIZEOF
LONG" = "8"; then
supports_multilib="yes"
fi
;;
...
...
@@ -11869,6 +11870,7 @@ AC_CONFIG_HEADERS([config_host/config_clang.h])
AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h])
AC_CONFIG_HEADERS([config_host/config_telepathy.h])
AC_CONFIG_HEADERS([config_host/config_typesizes.h])
AC_CONFIG_HEADERS([config_host/config_vclplug.h])
AC_CONFIG_HEADERS([config_host/config_version.h])
AC_OUTPUT
...
...
sal/CustomTarget_generated.mk
Dosyayı görüntüle @
8b8cd431
...
...
@@ -35,22 +35,7 @@ $(call gb_CustomTarget_get_target,sal/generated) : \
$(sal_DIR)/sal/typesizes.h
:
| $(sal_DIR)/sal/.dir
$
(
call gb_Output_announce,
$
(
subst
$(WORKDIR)
/,,
$@
)
,
$(true)
,ECH,1
)
echo
'/* This file is autogenerated from configure script data */'
>
$@
echo
>>
$@
echo
"#define SAL_TYPES_ALIGNMENT2
$(ALIGNOF_SHORT)
"
>>
$@
echo
"#define SAL_TYPES_ALIGNMENT4
$(ALIGNOF_INT)
"
>>
$@
ifeq
($(SIZEOF_LONG),8)
echo
"#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_LONG)"
>>
$@
else
ifeq
($(SIZEOF_DOUBLE),8)
echo
"#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_DOUBLE)"
>>
$@
else
echo
"#error alignment of some 8-byte type unknown"
>>
$@
endif
echo
"#define SAL_TYPES_SIZEOFSHORT $(SIZEOF_SHORT)"
>>
$@
echo
"#define SAL_TYPES_SIZEOFINT $(SIZEOF_INT)"
>>
$@
echo
"#define SAL_TYPES_SIZEOFLONG $(SIZEOF_LONG)"
>>
$@
echo
"#define SAL_TYPES_SIZEOFLONGLONG $(SIZEOF_LONGLONG)"
>>
$@
echo
"#define SAL_TYPES_SIZEOFPOINTER $(SIZEOF_POINTER)"
>>
$@
cp
$(SRCDIR)
/config_host/config_typesizes.h
$@
include
$(SRCDIR)/solenv/inc/udkversion.mk
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment