From a3a4e89efcb65ec99fc1f21aea0c021048e396d8 Mon Sep 17 00:00:00 2001 From: chao an Date: Fri, 23 Sep 2022 21:42:55 +0800 Subject: [PATCH] libs/libc/arm: use builtin routines instead of aliases of __aeabi_mem* Signed-off-by: chao an --- libs/libc/machine/arm/Make.defs | 5 ---- libs/libc/machine/arm/aeabi_memclr.c | 34 ------------------------- libs/libc/machine/arm/aeabi_memclr4.c | 34 ------------------------- libs/libc/machine/arm/aeabi_memclr8.c | 34 ------------------------- libs/libc/machine/arm/aeabi_memcpy.c | 35 -------------------------- libs/libc/machine/arm/aeabi_memcpy4.c | 35 -------------------------- libs/libc/machine/arm/aeabi_memcpy8.c | 35 -------------------------- libs/libc/machine/arm/aeabi_memmove.c | 35 -------------------------- libs/libc/machine/arm/aeabi_memmove4.c | 35 -------------------------- libs/libc/machine/arm/aeabi_memmove8.c | 35 -------------------------- libs/libc/machine/arm/aeabi_memset.c | 34 ------------------------- libs/libc/machine/arm/aeabi_memset4.c | 34 ------------------------- libs/libc/machine/arm/aeabi_memset8.c | 34 ------------------------- 13 files changed, 419 deletions(-) delete mode 100644 libs/libc/machine/arm/aeabi_memclr.c delete mode 100644 libs/libc/machine/arm/aeabi_memclr4.c delete mode 100644 libs/libc/machine/arm/aeabi_memclr8.c delete mode 100644 libs/libc/machine/arm/aeabi_memcpy.c delete mode 100644 libs/libc/machine/arm/aeabi_memcpy4.c delete mode 100644 libs/libc/machine/arm/aeabi_memcpy8.c delete mode 100644 libs/libc/machine/arm/aeabi_memmove.c delete mode 100644 libs/libc/machine/arm/aeabi_memmove4.c delete mode 100644 libs/libc/machine/arm/aeabi_memmove8.c delete mode 100644 libs/libc/machine/arm/aeabi_memset.c delete mode 100644 libs/libc/machine/arm/aeabi_memset4.c delete mode 100644 libs/libc/machine/arm/aeabi_memset8.c diff --git a/libs/libc/machine/arm/Make.defs b/libs/libc/machine/arm/Make.defs index ca536d7c63..5b5a8fc14b 100644 --- a/libs/libc/machine/arm/Make.defs +++ b/libs/libc/machine/arm/Make.defs @@ -42,11 +42,6 @@ else ifeq ($(CONFIG_ARCH_ARMV8M),y) # All ARMv8-M include $(TOPDIR)/libs/libc/machine/arm/armv8-m/Make.defs endif -CSRCS += aeabi_memclr.c aeabi_memclr4.c aeabi_memclr8.c -CSRCS += aeabi_memcpy.c aeabi_memcpy4.c aeabi_memcpy8.c -CSRCS += aeabi_memmove.c aeabi_memmove4.c aeabi_memmove8.c -CSRCS += aeabi_memset.c aeabi_memset4.c aeabi_memset8.c - ifneq ($(CONFIG_LIBSUPCXX),y) CSRCS += aeabi_atexit.c endif diff --git a/libs/libc/machine/arm/aeabi_memclr.c b/libs/libc/machine/arm/aeabi_memclr.c deleted file mode 100644 index 9b195cdb41..0000000000 --- a/libs/libc/machine/arm/aeabi_memclr.c +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memclr.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function __aeabi_memclr(void *s, size_t n) -{ - memset(s, 0, n); -} diff --git a/libs/libc/machine/arm/aeabi_memclr4.c b/libs/libc/machine/arm/aeabi_memclr4.c deleted file mode 100644 index 029cd13abe..0000000000 --- a/libs/libc/machine/arm/aeabi_memclr4.c +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memclr4.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function __aeabi_memclr4(void *s, size_t n) -{ - memset(s, 0, n); -} diff --git a/libs/libc/machine/arm/aeabi_memclr8.c b/libs/libc/machine/arm/aeabi_memclr8.c deleted file mode 100644 index 4463903a66..0000000000 --- a/libs/libc/machine/arm/aeabi_memclr8.c +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memclr8.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function __aeabi_memclr8(void *s, size_t n) -{ - memset(s, 0, n); -} diff --git a/libs/libc/machine/arm/aeabi_memcpy.c b/libs/libc/machine/arm/aeabi_memcpy.c deleted file mode 100644 index c74a060b38..0000000000 --- a/libs/libc/machine/arm/aeabi_memcpy.c +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memcpy.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function -__aeabi_memcpy(void *dest, const void *src, size_t n) -{ - memcpy(dest, src, n); -} diff --git a/libs/libc/machine/arm/aeabi_memcpy4.c b/libs/libc/machine/arm/aeabi_memcpy4.c deleted file mode 100644 index 9b98a17222..0000000000 --- a/libs/libc/machine/arm/aeabi_memcpy4.c +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memcpy4.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function -__aeabi_memcpy4(void *dest, const void *src, size_t n) -{ - memcpy(dest, src, n); -} diff --git a/libs/libc/machine/arm/aeabi_memcpy8.c b/libs/libc/machine/arm/aeabi_memcpy8.c deleted file mode 100644 index 0146c745b4..0000000000 --- a/libs/libc/machine/arm/aeabi_memcpy8.c +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memcpy8.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function -__aeabi_memcpy8(void *dest, const void *src, size_t n) -{ - memcpy(dest, src, n); -} diff --git a/libs/libc/machine/arm/aeabi_memmove.c b/libs/libc/machine/arm/aeabi_memmove.c deleted file mode 100644 index b36d178c1a..0000000000 --- a/libs/libc/machine/arm/aeabi_memmove.c +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memmove.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function -__aeabi_memmove(void *dest, const void *src, size_t n) -{ - memmove(dest, src, n); -} diff --git a/libs/libc/machine/arm/aeabi_memmove4.c b/libs/libc/machine/arm/aeabi_memmove4.c deleted file mode 100644 index 15171d7ff6..0000000000 --- a/libs/libc/machine/arm/aeabi_memmove4.c +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memmove4.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function -__aeabi_memmove4(void *dest, const void *src, size_t n) -{ - memmove(dest, src, n); -} diff --git a/libs/libc/machine/arm/aeabi_memmove8.c b/libs/libc/machine/arm/aeabi_memmove8.c deleted file mode 100644 index bacdaed7c0..0000000000 --- a/libs/libc/machine/arm/aeabi_memmove8.c +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memmove8.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function -__aeabi_memmove8(void *dest, const void *src, size_t n) -{ - memmove(dest, src, n); -} diff --git a/libs/libc/machine/arm/aeabi_memset.c b/libs/libc/machine/arm/aeabi_memset.c deleted file mode 100644 index 5bb8d73012..0000000000 --- a/libs/libc/machine/arm/aeabi_memset.c +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memset.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function __aeabi_memset(void *s, size_t n, int c) -{ - memset(s, c, n); -} diff --git a/libs/libc/machine/arm/aeabi_memset4.c b/libs/libc/machine/arm/aeabi_memset4.c deleted file mode 100644 index 0c51d05c9e..0000000000 --- a/libs/libc/machine/arm/aeabi_memset4.c +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memset4.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function __aeabi_memset4(void *s, size_t n, int c) -{ - memset(s, c, n); -} diff --git a/libs/libc/machine/arm/aeabi_memset8.c b/libs/libc/machine/arm/aeabi_memset8.c deleted file mode 100644 index d754545455..0000000000 --- a/libs/libc/machine/arm/aeabi_memset8.c +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** - * libs/libc/machine/arm/aeabi_memset8.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -void weak_function __aeabi_memset8(void *s, size_t n, int c) -{ - memset(s, c, n); -}