Always use the autoconfed sizes and alignments, not only when cross-compiling

4 files changed, 0 insertions, 52 deletions

diff --git a/sal/Executable_typesconfig.mk b/sal/Executable_typesconfig.mk
deleted file mode 100644
index db0cc3ae2a27..000000000000
--- a/sal/Executable_typesconfig.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Executable_Executable,typesconfig))
-
-$(eval $(call gb_Executable_add_defs,typesconfig,\
-	$(LFS_CFLAGS) \
-))
-
-$(eval $(call gb_Executable_add_cobjects,typesconfig,\
-	sal/typesconfig/typesconfig \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index a1e442dac9a1..b4f27b239ac4 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -30,8 +30,6 @@ $(eval $(call gb_Module_Module,sal))
 
 $(eval $(call gb_Module_add_targets,sal,\
 	Executable_cppunittester \
-	$(if $(filter $(CROSS_COMPILING),YES)$(filter $(COM),MSC),, \
-		Executable_typesconfig) \
 	$(if $(filter $(OS),ANDROID), \
 		Library_lo-bootstrap) \
 	Library_sal \
diff --git a/sal/Package_generated.mk b/sal/Package_generated.mk
index e2cad8ea35b6..6c946ffd321e 100644
--- a/sal/Package_generated.mk
+++ b/sal/Package_generated.mk
@@ -29,12 +29,6 @@ $(eval $(call gb_Package_Package,sal_generated,$(WORKDIR)/CustomTarget/sal/util)
 
 $(eval $(call gb_Package_add_customtarget,sal_generated,sal/util))
 
-ifneq ($(OS),WNT)
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,sal/util,\
-	$(call gb_Executable_get_target,typesconfig) \
-))
-endif
-
 $(eval $(call gb_Package_add_file,sal_generated,inc/rtlbootstrap.mk,rtlbootstrap.mk))
 $(eval $(call gb_Package_add_file,sal_generated,inc/sal/udkversion.h,sal/udkversion.h))
 
diff --git a/sal/util/Makefile b/sal/util/Makefile
index ad39b2412f63..87b3e29d8077 100644
--- a/sal/util/Makefile
+++ b/sal/util/Makefile
@@ -38,10 +38,6 @@ rtlbootstrap.mk: sal/typesizes.h
 	$(CXX) -E $(gb_OSDEFS) $(gb_CXXFLAGS) -D$(CPUNAME) -I. -I$(SRCDIR)/sal/rtl/source -I$(SRCDIR)/sal/inc bootstrap.cxx | grep '^RTL_' | sed -e 's/"//g' > $@
 
 sal/typesizes.h: sal
-ifneq ($(CROSS_COMPILING),YES)
-	$(gb_Helper_execute)typesconfig $@ > /dev/null
-
-else
 	echo '/* This file is autogenerated from configure script data */' > $@
 	echo >> $@
 	echo "#define SAL_TYPES_ALIGNMENT2	$(ALIGNOF_SHORT)" >> $@
@@ -59,8 +55,6 @@ endif
 	echo "#define SAL_TYPES_SIZEOFLONGLONG	$(SIZEOF_LONGLONG)" >> $@
 	echo "#define SAL_TYPES_SIZEOFPOINTER	$(SIZEOF_POINTER)" >> $@
 
-endif
-
 include $(SRCDIR)/solenv/inc/udkversion.mk
 
 sal/udkversion.h: sal