ArmPkg/CompilerIntrinsicsLib: Remove unused sources and clean up .inf

None of the .c/.h in Arm/ are used any more => remove them.
Also merge the CC flags for MSFT ARM and ARM64, since these are the
only archs we support for this package.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Pete Batard <pete@akeo.ie>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

19 files changed, 37 insertions, 1633 deletions

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/Llvm_int_lib.h b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/Llvm_int_lib.h
deleted file mode 100644
index 38bcad6..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/Llvm_int_lib.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/** @file

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-#include <Base.h>

-#include <Library/DebugLib.h>

-

-#define CHAR_BIT  8

-

-typedef union {

-    INT64   all;

-    struct {

-        UINT32 low;

-        INT32  high;

-    };

-} dwords;

-

-typedef union {

-    UINT64  all;

-    struct {

-        UINT32 low;

-        UINT32 high;

-    };

-} udwords;

-

-// __aeabi_ return values

-typedef struct {

-  UINT64  Quotent;

-  UINT64  Remainder;

-} ulldiv_t;

-

-typedef struct {

-  INT64   Quotent;

-  INT64   Remainder;

-} lldiv_t;

-

-typedef struct {

-  UINT32  Quotent;

-  UINT32  Remainder;

-} uidiv_return;

-

-#if __GNUC__

-  #define COUNT_LEADING_ZEROS(_a)   __builtin_clz((_a))

-  #define COUNT_TRAILING_ZEROS(_a)  __builtin_ctz((_a))

-#else

-#error COUNT_LEADING_ZEROS() and COUNT_TRAILING_ZEROS() macros not ported to your compiler

-#endif

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.c
deleted file mode 100644
index 0a1adb8..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/** @file

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-#include "Llvm_int_lib.h"

-

-// Returns: a << b

-

-// Precondition:  0 <= b < bits_in_dword

-

-INT64

-__ashldi3(INT64 a, INT32 b)

-{

-    const int bits_in_word = (int)(sizeof(INT32) * CHAR_BIT);

-    dwords input;

-    dwords result;

-    input.all = a;

-    if (b & bits_in_word)  // bits_in_word <= b < bits_in_dword

-    {

-        result.low = 0;

-        result.high = input.low << (b - bits_in_word);

-    }

-    else  // 0 <= b < bits_in_word

-    {

-        if (b == 0)

-            return a;

-        result.low  = input.low << b;

-        result.high = (input.high << b) | (input.low >> (bits_in_word - b));

-    }

-    return result.all;

-}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.c
deleted file mode 100644
index 5d9307e..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/** @file

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-#include "Llvm_int_lib.h"

-

-// Returns: arithmetic a >> b

-

-// Precondition:  0 <= b < bits_in_dword

-

-INT64

-__ashrdi3(INT64 a, INT32 b)

-{

-    const int bits_in_word = (int)(sizeof(INT32) * CHAR_BIT);

-    dwords input;

-    dwords result;

-    input.all = a;

-    if (b & bits_in_word)  // bits_in_word <= b < bits_in_dword

-    {

-        // result.high = input.high < 0 ? -1 : 0

-        result.high = input.high >> (bits_in_word - 1);

-        result.low = input.high >> (b - bits_in_word);

-    }

-    else  // 0 <= b < bits_in_word

-    {

-        if (b == 0)

-            return a;

-        result.high  = input.high >> b;

-        result.low = (input.high << (bits_in_word - b)) | (input.low >> b);

-    }

-    return result.all;

-}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.c
deleted file mode 100644
index d454748..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/** @file

-  Compiler intrinsic to return the number of leading zeros, ported from LLVM code.

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-// Returns: the number of leading 0-bits

-

-// Precondition: a != 0

-

-INT32

-__clzsi2(INT32 a)

-{

-    UINT32 x = (UINT32)a;

-    INT32 t = ((x & 0xFFFF0000) == 0) << 4;  // if (x is small) t = 16 else 0

-    x >>= 16 - t;      // x = [0 - 0xFFFF]

-    UINT32 r = t;       // r = [0, 16]

-    // return r + clz(x)

-    t = ((x & 0xFF00) == 0) << 3;

-    x >>= 8 - t;       // x = [0 - 0xFF]

-    r += t;            // r = [0, 8, 16, 24]

-    // return r + clz(x)

-    t = ((x & 0xF0) == 0) << 2;

-    x >>= 4 - t;       // x = [0 - 0xF]

-    r += t;            // r = [0, 4, 8, 12, 16, 20, 24, 28]

-    // return r + clz(x)

-    t = ((x & 0xC) == 0) << 1;

-    x >>= 2 - t;       // x = [0 - 3]

-    r += t;            // r = [0 - 30] and is even

-    // return r + clz(x)

-//     switch (x)

-//     {

-//     case 0:

-//         return r + 2;

-//     case 1:

-//         return r + 1;

-//     case 2:

-//     case 3:

-//         return r;

-//     }

-    return r + ((2 - x) & -((x & 2) == 0));

-}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.c
deleted file mode 100644
index 930a75f..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/** @file

-  Compiler intrinsic to return the number of trailing zeros, ported from LLVM code.

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-// Returns: the number of trailing 0-bits

-

-// Precondition: a != 0

-

-INT32

-__ctzsi2(INT32 a)

-{

-    UINT32 x = (UINT32)a;

-    INT32 t = ((x & 0x0000FFFF) == 0) << 4;  // if (x has no small bits) t = 16 else 0

-    x >>= t;           // x = [0 - 0xFFFF] + higher garbage bits

-    UINT32 r = t;       // r = [0, 16]

-    // return r + ctz(x)

-    t = ((x & 0x00FF) == 0) << 3;

-    x >>= t;           // x = [0 - 0xFF] + higher garbage bits

-    r += t;            // r = [0, 8, 16, 24]

-    // return r + ctz(x)

-    t = ((x & 0x0F) == 0) << 2;

-    x >>= t;           // x = [0 - 0xF] + higher garbage bits

-    r += t;            // r = [0, 4, 8, 12, 16, 20, 24, 28]

-    // return r + ctz(x)

-    t = ((x & 0x3) == 0) << 1;

-    x >>= t;

-    x &= 3;            // x = [0 - 3]

-    r += t;            // r = [0 - 30] and is even

-    // return r + ctz(x)

-//  The branch-less return statement below is equivalent

-//  to the following switch statement:

-//     switch (x)

-//     {

-//     case 0:

-//         return r + 2;

-//     case 2:

-//         return r + 1;

-//     case 1:

-//     case 3:

-//         return r;

-//     }

-    return r + ((2 - (x >> 1)) & -((x & 1) == 0));

-}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.c
deleted file mode 100644
index 320870a..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/** @file

-  Compiler intrinsic for 64-bit compare, ported from LLVM code.

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-UINT64 __udivmoddi4(UINT64 a, UINT64 b, UINT64* rem);

-

-// Returns: a / b

-

-INT64

-__divdi3(INT64 a, INT64 b)

-{

-    const int bits_in_dword_m1 = (int)(sizeof(INT64) * CHAR_BIT) - 1;

-    INT64 s_a = a >> bits_in_dword_m1;           // s_a = a < 0 ? -1 : 0

-    INT64 s_b = b >> bits_in_dword_m1;           // s_b = b < 0 ? -1 : 0

-    a = (a ^ s_a) - s_a;                         // negate if s_a == -1

-    b = (b ^ s_b) - s_b;                         // negate if s_b == -1

-    s_a ^= s_b;                                  // sign of quotient

-    return (__udivmoddi4(a, b, (UINT64*)0) ^ s_a) - s_a;  // negate if s_a == -1

-}

-

-

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.c
deleted file mode 100644
index 804886d..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/** @file

-  Compiler intrinsic for 32--bit unsigned division, ported from LLVM code.

-

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-UINT32 __udivsi3(UINT32 n, UINT32 d);

-

-// Returns: a / b

-

-INT32

-__divsi3(INT32 a, INT32 b)

-{

-    const int bits_in_word_m1 = (int)(sizeof(INT32) * CHAR_BIT) - 1;

-    INT32 s_a = a >> bits_in_word_m1;           // s_a = a < 0 ? -1 : 0

-    INT32 s_b = b >> bits_in_word_m1;           // s_b = b < 0 ? -1 : 0

-    a = (a ^ s_a) - s_a;                         // negate if s_a == -1

-    b = (b ^ s_b) - s_b;                         // negate if s_b == -1

-    s_a ^= s_b;                                  // sign of quotient

-    return (__udivsi3(a, b) ^ s_a) - s_a;        // negate if s_a == -1

-}

-

-

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.c
deleted file mode 100644
index 83129b2..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/** @file

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-#include "Llvm_int_lib.h"

-

-// Returns: logical a >> b

-

-// Precondition:  0 <= b < bits_in_dword

-

-INT64

-__lshrdi3(INT64 a, INT32 b)

-{

-    const int bits_in_word = (int)(sizeof(INT32) * CHAR_BIT);

-    udwords input;

-    udwords result;

-    input.all = a;

-    if (b & bits_in_word)  // bits_in_word <= b < bits_in_dword

-    {

-        result.high = 0;

-        result.low = input.high >> (b - bits_in_word);

-    }

-    else  // 0 <= b < bits_in_word

-    {

-        if (b == 0)

-            return a;

-        result.high  = input.high >> b;

-        result.low = (input.high << (bits_in_word - b)) | (input.low >> b);

-    }

-    return result.all;

-}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.c
deleted file mode 100644
index cd333a3..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/** @file

-  Compiler intrinsic for 64-bit mod, ported from LLVM code.

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-UINT64 __udivmoddi4(UINT64 a, UINT64 b, UINT64* rem);

-

-// Returns: a % b

-

-INT64

-__moddi3(INT64 a, INT64 b)

-{

-    const int bits_in_dword_m1 = (int)(sizeof(INT64) * CHAR_BIT) - 1;

-    INT64 s = b >> bits_in_dword_m1;  // s = b < 0 ? -1 : 0

-    b = (b ^ s) - s;                   // negate if s == -1

-    s = a >> bits_in_dword_m1;         // s = a < 0 ? -1 : 0

-    a = (a ^ s) - s;                   // negate if s == -1

-    INT64 r;

-    __udivmoddi4(a, b, (UINT64*)&r);

-    return (r ^ s) - s;                // negate if s == -1

-}

-

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.c
deleted file mode 100644
index 964c346..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/** @file

-  Compiler intrinsic for 32-bit mod, ported from LLVM code.

-

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-// Returns: a % b

-

-INT32

-__modsi3(INT32 a, INT32 b)

-{

-    return a - (a / b) * b;

-}

-

-

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.c
deleted file mode 100644
index 869c4be..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/** @file

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-#include <Base.h>

-#include "Llvm_int_lib.h"

-

-

-// Returns: a * b

-

-static

-INT64

-__muldsi3(UINT32 a, UINT32 b)

-{

-    dwords r;

-    const int bits_in_word_2 = (int)(sizeof(INT32) * CHAR_BIT) / 2;

-    const UINT32 lower_mask = (UINT32)~0 >> bits_in_word_2;

-    r.low = (a & lower_mask) * (b & lower_mask);

-    UINT32 t = r.low >> bits_in_word_2;

-    r.low &= lower_mask;

-    t += (a >> bits_in_word_2) * (b & lower_mask);

-    r.low += (t & lower_mask) << bits_in_word_2;

-    r.high = t >> bits_in_word_2;

-    t = r.low >> bits_in_word_2;

-    r.low &= lower_mask;

-    t += (b >> bits_in_word_2) * (a & lower_mask);

-    r.low += (t & lower_mask) << bits_in_word_2;

-    r.high += t >> bits_in_word_2;

-    r.high += (a >> bits_in_word_2) * (b >> bits_in_word_2);

-    return r.all;

-}

-

-// Returns: a * b

-

-INT64

-__muldi3(INT64 a, INT64 b)

-{

-    dwords x;

-    x.all = a;

-    dwords y;

-    y.all = b;

-    dwords r;

-    r.all = __muldsi3(x.low, y.low);

-    r.high += x.high * y.low + x.low * y.high;

-    return r.all;

-}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.c
deleted file mode 100644
index 89c367f..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/** @file

-  Compiler intrinsic for 64-bit compare, ported from LLVM code.

-

-  Copyright (c) 2008-2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-

-// Returns:  if (a <  b) returns 0

-//           if (a == b) returns 1

-//           if (a >  b) returns 2

-

-UINT32

-__ucmpdi2(UINT64 a, UINT64 b)

-{

-    udwords x;

-    x.all = a;

-    udwords y;

-    y.all = b;

-    if (x.high < y.high)

-        return 0;

-    if (x.high > y.high)

-        return 2;

-    if (x.low < y.low)

-        return 0;

-    if (x.low > y.low)

-        return 2;

-    return 1;

-}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.c
deleted file mode 100644
index 6718dd8..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @file

-  Compiler intrinsic for 64-bit unisigned div, ported from LLVM code.

-

-  Copyright (c) 2008-2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-UINT64 __udivmoddi4 (UINT64 a, UINT64 b, UINT64 *rem);

-

-// Returns: a / b

-

-UINT64

-__udivdi3(UINT64 a, UINT64 b)

-{

-    return __udivmoddi4(a, b, 0);

-}

-

-

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.c
deleted file mode 100644
index 1dca318..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/** @file

-  Compiler intrinsic for 64-bit compare, ported from LLVM code.

-

-  Copyright (c) 2008-2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-// Effects: if rem != 0, *rem = a % b

-// Returns: a / b

-

-// Translated from Figure 3-40 of The PowerPC Compiler Writer's Guide

-

-UINT64

-__udivmoddi4 (UINT64 a, UINT64 b, UINT64* rem)

-{

-    const unsigned n_uword_bits = sizeof(UINT32) * CHAR_BIT;

-    const unsigned n_udword_bits = sizeof(UINT64) * CHAR_BIT;

-    udwords n;

-    n.all = a;

-    udwords d;

-    d.all = b;

-    udwords q;

-    udwords r;

-    unsigned sr;

-

-    if (b == 0) {

-//      ASSERT (FALSE);

-      return 0;

-    }

-

-    // special cases, X is unknown, K != 0

-    if (n.high == 0)

-    {

-        if (d.high == 0)

-        {

-            // 0 X

-            // ---

-            // 0 X

-            if (rem)

-                *rem = n.low % d.low;

-            return n.low / d.low;

-        }

-        // 0 X

-        // ---

-        // K X

-        if (rem)

-            *rem = n.low;

-        return 0;

-    }

-    // n.high != 0

-    if (d.low == 0)

-    {

-        if (d.high == 0)

-        {

-            // K X

-            // ---

-            // 0 0

-            if (rem)

-                *rem = n.high % d.low;

-            return n.high / d.low;

-        }

-        // d.high != 0

-        if (n.low == 0)

-        {

-            // K 0

-            // ---

-            // K 0

-            if (rem)

-            {

-                r.high = n.high % d.high;

-                r.low = 0;

-                *rem = r.all;

-            }

-            return n.high / d.high;

-        }

-        // K K

-        // ---

-        // K 0

-        if ((d.high & (d.high - 1)) == 0)     // if d is a power of 2

-        {

-            if (rem)

-            {

-                r.low = n.low;

-                r.high = n.high & (d.high - 1);

-                *rem = r.all;

-            }

-            return n.high >> COUNT_TRAILING_ZEROS(d.high);

-        }

-        // K K

-        // ---

-        // K 0

-        sr = COUNT_LEADING_ZEROS(d.high) - COUNT_LEADING_ZEROS(n.high);

-        // 0 <= sr <= n_uword_bits - 2 or sr large

-        if (sr > n_uword_bits - 2)

-        {

-           if (rem)

-                *rem = n.all;

-            return 0;

-        }

-        ++sr;

-        // 1 <= sr <= n_uword_bits - 1

-        // q.all = n.all << (n_udword_bits - sr);

-        q.low = 0;

-        q.high = n.low << (n_uword_bits - sr);

-        // r.all = n.all >> sr;

-        r.high = n.high >> sr;

-        r.low = (n.high << (n_uword_bits - sr)) | (n.low >> sr);

-    }

-    else  // d.low != 0

-    {

-        if (d.high == 0)

-        {

-            // K X

-            // ---

-            // 0 K

-            if ((d.low & (d.low - 1)) == 0)     // if d is a power of 2

-            {

-                if (rem)

-                    *rem = n.low & (d.low - 1);

-                if (d.low == 1)

-                    return n.all;

-                unsigned sr = COUNT_TRAILING_ZEROS(d.low);

-                q.high = n.high >> sr;

-                q.low = (n.high << (n_uword_bits - sr)) | (n.low >> sr);

-                return q.all;

-            }

-            // K X

-            // ---

-            // 0 K

-            sr = 1 + n_uword_bits + COUNT_LEADING_ZEROS(d.low) - COUNT_LEADING_ZEROS(n.high);

-            // 2 <= sr <= n_udword_bits - 1

-            // q.all = n.all << (n_udword_bits - sr);

-            // r.all = n.all >> sr;

-            // if (sr == n_uword_bits)

-            // {

-            //     q.low = 0;

-            //     q.high = n.low;

-            //     r.high = 0;

-            //     r.low = n.high;

-            // }

-            // else if (sr < n_uword_bits)  // 2 <= sr <= n_uword_bits - 1

-            // {

-            //     q.low = 0;

-            //     q.high = n.low << (n_uword_bits - sr);

-            //     r.high = n.high >> sr;

-            //     r.low = (n.high << (n_uword_bits - sr)) | (n.low >> sr);

-            // }

-            // else              // n_uword_bits + 1 <= sr <= n_udword_bits - 1

-            // {

-            //     q.low = n.low << (n_udword_bits - sr);

-            //     q.high = (n.high << (n_udword_bits - sr)) |

-            //              (n.low >> (sr - n_uword_bits));

-            //     r.high = 0;

-            //     r.low = n.high >> (sr - n_uword_bits);

-            // }

-            q.low =  (n.low << (n_udword_bits - sr)) &

-                     ((INT32)(n_uword_bits - sr) >> (n_uword_bits-1));

-            q.high = ((n.low << ( n_uword_bits - sr))                       &

-                     ((INT32)(sr - n_uword_bits - 1) >> (n_uword_bits-1))) |

-                     (((n.high << (n_udword_bits - sr))                     |

-                     (n.low >> (sr - n_uword_bits)))                        &

-                     ((INT32)(n_uword_bits - sr) >> (n_uword_bits-1)));

-            r.high = (n.high >> sr) &

-                     ((INT32)(sr - n_uword_bits) >> (n_uword_bits-1));

-            r.low =  ((n.high >> (sr - n_uword_bits))                       &

-                     ((INT32)(n_uword_bits - sr - 1) >> (n_uword_bits-1))) |

-                     (((n.high << (n_uword_bits - sr))                      |

-                     (n.low >> sr))                                         &

-                     ((INT32)(sr - n_uword_bits) >> (n_uword_bits-1)));

-        }

-        else

-        {

-            // K X

-            // ---

-            // K K

-            sr = COUNT_LEADING_ZEROS(d.high) - COUNT_LEADING_ZEROS(n.high);

-            // 0 <= sr <= n_uword_bits - 1 or sr large

-            if (sr > n_uword_bits - 1)

-            {

-               if (rem)

-                    *rem = n.all;

-                return 0;

-            }

-            ++sr;

-            // 1 <= sr <= n_uword_bits

-            // q.all = n.all << (n_udword_bits - sr);

-            q.low = 0;

-            q.high = n.low << (n_uword_bits - sr);

-            // r.all = n.all >> sr;

-            // if (sr < n_uword_bits)

-            // {

-            //     r.high = n.high >> sr;

-            //     r.low = (n.high << (n_uword_bits - sr)) | (n.low >> sr);

-            // }

-            // else

-            // {

-            //     r.high = 0;

-            //     r.low = n.high;

-            // }

-            r.high = (n.high >> sr) &

-                     ((INT32)(sr - n_uword_bits) >> (n_uword_bits-1));

-            r.low = (n.high << (n_uword_bits - sr)) |

-                    ((n.low >> sr)                  &

-                    ((INT32)(sr - n_uword_bits) >> (n_uword_bits-1)));

-        }

-    }

-    // Not a special case

-    // q and r are initialized with:

-    // q.all = n.all << (n_udword_bits - sr);

-    // r.all = n.all >> sr;

-    // 1 <= sr <= n_udword_bits - 1

-    UINT32 carry = 0;

-    for (; sr > 0; --sr)

-    {

-        // r:q = ((r:q)  << 1) | carry

-        r.high = (r.high << 1) | (r.low  >> (n_uword_bits - 1));

-        r.low  = (r.low  << 1) | (q.high >> (n_uword_bits - 1));

-        q.high = (q.high << 1) | (q.low  >> (n_uword_bits - 1));

-        q.low  = (q.low  << 1) | carry;

-        // carry = 0;

-        // if (r.all >= d.all)

-        // {

-        //      r.all -= d.all;

-        //      carry = 1;

-        // }

-        const INT64 s = (INT64)(d.all - r.all - 1) >> (n_udword_bits - 1);

-        carry = s & 1;

-        r.all -= d.all & s;

-    }

-    q.all = (q.all << 1) | carry;

-    if (rem)

-        *rem = r.all;

-    return q.all;

-}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.c
deleted file mode 100644
index e134086..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/** @file

-  Compiler intrinsic for 32-bit unsigned div, ported from LLVM code.

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-

-// Returns: n / d

-

-// Translated from Figure 3-40 of The PowerPC Compiler Writer's Guide

-

-UINT32

-__udivsi3(UINT32 n, UINT32 d)

-{

-    const unsigned n_uword_bits = sizeof(UINT32) * CHAR_BIT;

-    UINT32 q;

-    UINT32 r;

-    unsigned sr;

-

-    // special cases

-    if (d == 0) {

-//        ASSERT (FALSE);

-        return 0; // ?!

-        }

-    if (n == 0)

-        return 0;

-

-    sr = COUNT_LEADING_ZEROS(d) - COUNT_LEADING_ZEROS(n);

-    // 0 <= sr <= n_uword_bits - 1 or sr large

-    if (sr > n_uword_bits - 1)  // d > r

-        return 0;

-    if (sr == n_uword_bits - 1)  // d == 1

-        return n;

-    ++sr;

-    // 1 <= sr <= n_uword_bits - 1

-    // Not a special case

-    q = n << (n_uword_bits - sr);

-    r = n >> sr;

-    UINT32 carry = 0;

-    for (; sr > 0; --sr)

-    {

-        // r:q = ((r:q)  << 1) | carry

-        r = (r << 1) | (q >> (n_uword_bits - 1));

-        q = (q << 1) | carry;

-        // carry = 0;

-        // if (r.all >= d.all)

-        // {

-        //      r.all -= d.all;

-        //      carry = 1;

-        // }

-        const INT32 s = (INT32)(d - r - 1) >> (n_uword_bits - 1);

-        carry = s & 1;

-        r -= d & s;

-    }

-    q = (q << 1) | carry;

-    return q;

-}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldivmod.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldivmod.c
deleted file mode 100644
index 1e0fba2..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldivmod.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/** @file

-

-  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-

-#include "Llvm_int_lib.h"

-#include <Library/BaseLib.h>

-

-

-UINT32 __udivsi3(UINT32 n, UINT32 d);

-UINT32 __umodsi3(UINT32 a, UINT32 b);

-

-

-UINT64

-__aeabi_uidivmod(unsigned numerator, unsigned denominator)

-{

-  UINT64  Return;

-

-  Return = __udivsi3 (numerator, denominator);

-  Return |= LShiftU64 (__umodsi3 (numerator, denominator), 32);

-

-  return Return;

-}

-

-unsigned

-__aeabi_uidiv (unsigned n, unsigned d)

-{

-  return __udivsi3 (n, d);

-}

-

-

-

-

-

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.c
deleted file mode 100644
index f5bef99..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/** @file

-  Compiler intrinsic for 64-bit unsigned mod, ported from LLVM code.

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-UINT64 __udivmoddi4(UINT64 a, UINT64 b, UINT64* rem);

-

-// Returns: a % b

-

-UINT64

-__umoddi3(UINT64 a, UINT64 b)

-{

-    UINT64 r;

-    __udivmoddi4(a, b, &r);

-    return r;

-}

-

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.c b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.c
deleted file mode 100644
index 8515171..0000000
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/** @file

-  Compiler intrinsic for 32-bit unsigned mod, ported from LLVM code.

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-/**

-  University of Illinois/NCSA

-  Open Source License

-

-  Copyright (c) 2003-2008 University of Illinois at Urbana-Champaign.

-  All rights reserved.

-

-  Developed by:

-

-      LLVM Team

-

-      University of Illinois at Urbana-Champaign

-

-      http://llvm.org

-

-  Permission is hereby granted, free of charge, to any person obtaining a copy of

-  this software and associated documentation files (the "Software"), to deal with

-  the Software without restriction, including without limitation the rights to

-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

-  of the Software, and to permit persons to whom the Software is furnished to do

-  so, subject to the following conditions:

-

-      * Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimers.

-

-      * Redistributions in binary form must reproduce the above copyright notice,

-        this list of conditions and the following disclaimers in the

-        documentation and/or other materials provided with the distribution.

-

-      * Neither the names of the LLVM Team, University of Illinois at

-        Urbana-Champaign, nor the names of its contributors may be used to

-        endorse or promote products derived from this Software without specific

-        prior written permission.

-

-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-  CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE

-  SOFTWARE.

-**/

-

-

-#include "Llvm_int_lib.h"

-

-

-// Returns: a % b

-

-UINT32

-__umodsi3(UINT32 a, UINT32 b)

-{

-    return a - (a / b) * b;

-}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
index 0d56349..0203ecb 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
@@ -19,10 +19,12 @@
 

 [Sources]

   memcpy.c             | RVCT

-  memcpy.c             | GCC

-  memcpy_ms.c          | MSFT

   memset.c             | RVCT

+

+  memcpy.c             | GCC

   memset.c             | GCC

+

+  memcpy_ms.c          | MSFT

   memset_ms.c          | MSFT

 

 [Sources.ARM]

@@ -38,73 +40,44 @@
   Arm/uldiv.asm        | RVCT

   Arm/ldivmod.asm      | RVCT

 

+  Arm/ashrdi3.S        | GCC

+  Arm/ashldi3.S        | GCC

+  Arm/div.S            | GCC

+  Arm/divdi3.S         | GCC

+  Arm/divsi3.S         | GCC

+  Arm/lshrdi3.S        | GCC

+  Arm/memmove.S        | GCC

+  Arm/modsi3.S         | GCC

+  Arm/moddi3.S         | GCC

+  Arm/muldi3.S         | GCC

+  Arm/mullu.S          | GCC

+  Arm/udivsi3.S        | GCC

+  Arm/umodsi3.S        | GCC

+  Arm/udivdi3.S        | GCC

+  Arm/umoddi3.S        | GCC

+  Arm/udivmoddi4.S     | GCC

+  Arm/clzsi2.S         | GCC

+  Arm/ctzsi2.S         | GCC

+  Arm/ucmpdi2.S        | GCC

+  Arm/switch8.S        | GCC

+  Arm/switchu8.S       | GCC

+  Arm/switch16.S       | GCC

+  Arm/switch32.S       | GCC

+  Arm/sourcery.S       | GCC

+  Arm/uldiv.S          | GCC

+  Arm/ldivmod.S        | GCC

+  Arm/llsr.S           | GCC

+  Arm/llsl.S           | GCC

 

-#

-# Move .c to .s to work around LLVM issues

-#

-#  Arm/ashrdi3.c    | GCC

-#  Arm/ashldi3.c    | GCC

-#  Arm/divdi3.c     | GCC

-#  Arm/divsi3.c     | GCC

-#  Arm/lshrdi3.c    | GCC

-  Arm/ashrdi3.S    | GCC

-  Arm/ashldi3.S    | GCC

-  Arm/div.S        | GCC

-  Arm/divdi3.S     | GCC

-  Arm/divsi3.S     | GCC

-  Arm/lshrdi3.S    | GCC

-

-  Arm/memmove.S    | GCC

-

-#  Arm/modsi3.c     | GCC

-#  Arm/moddi3.c     | GCC

-#  Arm/muldi3.c     | GCC

-  Arm/modsi3.S     | GCC

-  Arm/moddi3.S     | GCC

-  Arm/muldi3.S     | GCC

-  Arm/mullu.S      | GCC

-

-#  Arm/udivsi3.c    | GCC

-#  Arm/umodsi3.c    | GCC

-#  Arm/udivdi3.c    | GCC

-#  Arm/umoddi3.c    | GCC

-#  Arm/udivmoddi4.c | GCC

-  Arm/udivsi3.S    | GCC

-  Arm/umodsi3.S    | GCC

-  Arm/udivdi3.S    | GCC

-  Arm/umoddi3.S    | GCC

-  Arm/udivmoddi4.S | GCC

-

-#  Arm/clzsi2.c     | GCC

-#  Arm/ctzsi2.c     | GCC

-#  Arm/ucmpdi2.c    | GCC

-  Arm/clzsi2.S     | GCC

-  Arm/ctzsi2.S     | GCC

-  Arm/ucmpdi2.S    | GCC

-  Arm/switch8.S    | GCC

-  Arm/switchu8.S   | GCC

-  Arm/switch16.S   | GCC

-  Arm/switch32.S   | GCC

-

-  Arm/sourcery.S   | GCC

-  Arm/uldiv.S      | GCC

-  Arm/ldivmod.S    | GCC

-

-  Arm/llsr.S       | GCC

-  Arm/llsl.S       | GCC

-

-  Arm/div.asm      | MSFT

-  Arm/uldiv.asm    | MSFT

-  Arm/ldivmod.asm  | MSFT

-  Arm/llsr.asm     | MSFT

+  Arm/div.asm          | MSFT

+  Arm/uldiv.asm        | MSFT

+  Arm/ldivmod.asm      | MSFT

+  Arm/llsr.asm         | MSFT

 

 [Packages]

   MdePkg/MdePkg.dec

   ArmPkg/ArmPkg.dec

 

-[LibraryClasses]

-

 [BuildOptions]

-  MSFT:*_*_ARM_CC_FLAGS = /GL-

+  MSFT:*_*_*_CC_FLAGS = /GL-

   MSFT:*_*_ARM_ASM_FLAGS = /oldit

-  MSFT:*_*_AARCH64_CC_FLAGS = /GL-