[Libreoffice-commits] core.git: 3 commits - bridges/source ios/experimental solenv/gbuild
Tor Lillqvist
tml at collabora.com
Wed Oct 2 00:01:08 PDT 2013
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx | 2 -
bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx | 19 +++++++++++++-
ios/experimental/LibreOffice/LibreOffice/AppDelegate.m | 6 ++--
ios/experimental/LibreOffice/LibreOffice/View.m | 2 -
ios/experimental/LibreOffice/LibreOffice/ViewController.m | 2 -
solenv/gbuild/platform/IOS_ARM_GCC.mk | 13 +++++++++
6 files changed, 37 insertions(+), 7 deletions(-)
New commits:
commit dba1bb24ccca95bcdfd4dfae5053867af9d18bab
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 2 09:59:07 2013 +0300
Add dummy arm64 code to just get it to compile for now
Change-Id: I9898c0757a2dd495c73bd4b485dd8489f4a2b08e
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
index cdf0e19..78a0d3e 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef __arm
+#if defined(__arm) || defined(__arm64)
// For iOS devices (ARM). Basically a copy of n
// ../gcc3_linux_arm/cpp2uno.cxx with some cleanups and necessary
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
index 892dc8c..cef2ecf 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef __arm
+#if defined(__arm) || defined(__arm64)
#include <com/sun/star/uno/RuntimeException.hpp>
@@ -175,6 +175,8 @@ void callVirtualMethod(
sal_uInt32 nGPR,
double *pFPR)
{
+#ifdef __arm
+
// never called
if (! pThis)
CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
@@ -225,6 +227,21 @@ void callVirtualMethod(
: "r0", "r1", "r2", "r3", "r4", "r5");
MapReturn(r0, r1, pReturnType, (sal_uInt32*)pRegisterReturn);
+
+#else
+ abort(); // arm64 code not yet implemented
+
+ (void) pThis;
+ (void) nVtableIndex;
+ (void) pRegisterReturn;
+ (void) pReturnType;
+ (void) pStack;
+ (void) nStack;
+ (void) pGPR;
+ (void) nGPR;
+ (void) pFPR;
+#endif
+
}
}
commit 0f3ad8ce369136c5904e3906a26a764b643d4844
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 2 09:49:27 2013 +0300
Need to list all places we have libs here, too
They are no longer simply in solver.
Change-Id: Ibf00854a8a17d97357748caf14e7323e029dfd44
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index b151a16..fea5802 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -118,6 +118,19 @@ define gb_LinkTarget__command_dynamiclink
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(wildcard $(OUTDIR)/lib/*.a) \
+ $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
+ $(HUNSPELL_LIBS) \
+ $(HYPHEN_LIB) \
+ $(MYTHES_LIBS) \
+ $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \
+ $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \
+ $(wildcard $(WORKDIR)/UnpackedTarball/libmspub/src/lib/.libs/*.a) \
+ $(wildcard $(WORKDIR)/UnpackedTarball/libmwaw/src/lib/.libs/*.a) \
+ $(wildcard $(WORKDIR)/UnpackedTarball/libodfgen/src/.libs/*.a) \
+ $(wildcard $(WORKDIR)/UnpackedTarball/liborcus/src/*/.libs/*.a) \
+ $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \
+ $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \
+ $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \
$(T_LIBS) \
-o $(1))
endef
commit b7d7e3d7d6bb005701f6659802aa38a0e78c01ad
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 2 09:39:41 2013 +0300
WaE: NSLog format errors when compiling as 64-bit code
Use long format modifiers and insert casts to make the code happy both
as 32- and 64-bit.
(Sure, this is just in temporary debugging output NSLog() calls.)
Change-Id: I7c05c59a76e683b3401974c2b468d1aee2de4098
diff --git a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
index dd5ac41..b0857ce 100644
--- a/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
+++ b/ios/experimental/LibreOffice/LibreOffice/AppDelegate.m
@@ -64,7 +64,7 @@ static View *theView;
[self.window addGestureRecognizer: tapRecognizer];
[self.window addGestureRecognizer: panRecognizer];
- NSLog(@"statusBarOrientation: %d", [[UIApplication sharedApplication] statusBarOrientation]);
+ NSLog(@"statusBarOrientation: %ld", (long) [[UIApplication sharedApplication] statusBarOrientation]);
if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]))
lo_set_view_size(applicationFrame.size.height, applicationFrame.size.width);
@@ -94,7 +94,7 @@ static View *theView;
- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
{
- NSLog(@"textView: %@ shouldChangeTextInRange:[%u,%u] replacementText:%@", textView, range.location, range.length, text);
+ NSLog(@"textView: %@ shouldChangeTextInRange:[%lu,%lu] replacementText:%@", textView, (unsigned long) range.location, (unsigned long) range.length, text);
assert(textView == theView->textView);
for (NSUInteger i = 0; i < [text length]; i++)
@@ -137,7 +137,7 @@ static View *theView;
NSLog(@"New applicationFrame: %dx%d@(%d,%d)",
(int) applicationFrame.size.width, (int) applicationFrame.size.height,
(int) applicationFrame.origin.x, (int) applicationFrame.origin.y);
- NSLog(@"statusBarOrientation: %d", [[UIApplication sharedApplication] statusBarOrientation]);
+ NSLog(@"statusBarOrientation: %ld", (long) [[UIApplication sharedApplication] statusBarOrientation]);
if (UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]))
lo_set_view_size(applicationFrame.size.height, applicationFrame.size.width);
diff --git a/ios/experimental/LibreOffice/LibreOffice/View.m b/ios/experimental/LibreOffice/LibreOffice/View.m
index ed1abc69..8c490cb 100644
--- a/ios/experimental/LibreOffice/LibreOffice/View.m
+++ b/ios/experimental/LibreOffice/LibreOffice/View.m
@@ -15,7 +15,7 @@
- (void)drawRect:(CGRect)rect
{
NSLog(@"drawRect: %dx%d@(%d,%d)", (int) rect.size.width, (int) rect.size.height, (int) rect.origin.x, (int) rect.origin.y);
- NSLog(@"statusBarOrientation: %d", [[UIApplication sharedApplication] statusBarOrientation]);
+ NSLog(@"statusBarOrientation: %ld", (long)[[UIApplication sharedApplication] statusBarOrientation]);
// NSDate *startDate = [NSDate date];
diff --git a/ios/experimental/LibreOffice/LibreOffice/ViewController.m b/ios/experimental/LibreOffice/LibreOffice/ViewController.m
index a0c4985..a7977af 100644
--- a/ios/experimental/LibreOffice/LibreOffice/ViewController.m
+++ b/ios/experimental/LibreOffice/LibreOffice/ViewController.m
@@ -29,7 +29,7 @@
{
(void) fromInterfaceOrientation;
- NSLog(@"didRotateFromInterfaceOrientation: statusBarOrientation: %d interfaceOrientation: %d", [[UIApplication sharedApplication] statusBarOrientation], [self interfaceOrientation]);
+ NSLog(@"didRotateFromInterfaceOrientation: statusBarOrientation: %ld interfaceOrientation: %ld", (long) [[UIApplication sharedApplication] statusBarOrientation], (long) [self interfaceOrientation]);
}
@end
More information about the Libreoffice-commits
mailing list