From 6daac9adb4e367f1830a2eaa72913dd367523f88 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 2 Nov 2016 21:27:20 +0100
Subject: Drop unused nGPR parameter

same as aa04177e7c43d75bc87875a9d8ce2393d7263822 for gcc_linux_x86-64

Change-Id: I2c1e203271aa0038b83c3c55a37eab59411a6857
---
 bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx | 6 ++----
 bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx | 4 ++--
 bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx           | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'bridges')

diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx
index edae16edd6f9..513018c28d11 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.cxx
@@ -48,14 +48,12 @@
 void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
     void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn,
     typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn,
-    sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, sal_uInt32 nGPR,
-    double * pFPR, sal_uInt32 nFPR)
+    sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, double * pFPR,
+    sal_uInt32 nFPR)
 {
     // Should not happen, but...
     if ( nFPR > x86_64::MAX_SSE_REGS )
         nFPR = x86_64::MAX_SSE_REGS;
-    if ( nGPR > x86_64::MAX_GPR_REGS )
-        nGPR = x86_64::MAX_GPR_REGS;
 
     // Work around -fsanitize=address "inline assembly requires more registers
     // than available" error:
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx
index ddd0493dc6c4..c94333ec43ae 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod.hxx
@@ -31,8 +31,8 @@ namespace CPPU_CURRENT_NAMESPACE {
 void callVirtualMethod(
     void * pThis, sal_uInt32 nVtableIndex, void * pRegisterReturn,
     typelib_TypeDescriptionReference * pReturnTypeRef, bool bSimpleReturn,
-    sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, sal_uInt32 nGPR,
-    double * pFPR, sal_uInt32 nFPR);
+    sal_uInt64 *pStack, sal_uInt32 nStack, sal_uInt64 *pGPR, double * pFPR,
+    sal_uInt32 nFPR);
 
 }
 
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
index ecf906633966..5179918872af 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
@@ -242,7 +242,7 @@ static void cpp_call(
                 pAdjustedThisPtr, aVtableSlot.index,
                 pCppReturn, pReturnTypeRef, bSimpleReturn,
                 pStackStart, ( pStack - pStackStart ),
-                pGPR, nGPR,
+                pGPR,
                 pFPR, nFPR );
         } catch (const Exception &) {
             throw;
-- 
cgit