[incubator-nuttx] 01/02: Revert "sim: Suppress "has no symbols" warnings for macOS"

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 1195228109cf852911b0925e8db24a12451fd1f3
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Mon May 4 22:04:16 2020 +0900

    Revert "sim: Suppress "has no symbols" warnings for macOS"
    
    This reverts commit c1beda50f8217a28f1397a92dc4e8b35854a2761.
    
    IMO, it's too ugly hack just to surpress warnings.
---
 boards/sim/sim/sim/include/dummy.h   | 46 ------------------------------------
 boards/sim/sim/sim/scripts/Make.defs |  5 ----
 2 files changed, 51 deletions(-)

diff --git a/boards/sim/sim/sim/include/dummy.h b/boards/sim/sim/sim/include/dummy.h
deleted file mode 100644
index 21c0ada..0000000
--- a/boards/sim/sim/sim/include/dummy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
- * boards/sim/sim/sim/include/dummy.h
- *
- * 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.
- *
- ****************************************************************************/
-
-#ifndef __BOARDS_SIM_SIM_SIM_INCLUDE_DUMMY_H
-#define __BOARDS_SIM_SIM_SIM_INCLUDE_DUMMY_H
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#define DUMMY_NAME(name) DUMMY_NAME_(dummy_, name)
-#define DUMMY_NAME_(prefix, name) prefix##name
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/* ranlib on macOS will generate "has no symbols" warning if the static
- * library don't expose any public symbol, so let's always generate a dummy
- * global function to overcome this issue.
- */
-
-#ifndef __ASSEMBLY__
-void DUMMY_NAME(CKSUM_SELF)(void)
-{
-}
-#endif
-
-#endif /* __BOARDS_SIM_SIM_SIM_INCLUDE_DUMMY_H */
diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs
index 727ab27..28e7112 100644
--- a/boards/sim/sim/sim/scripts/Make.defs
+++ b/boards/sim/sim/sim/scripts/Make.defs
@@ -47,11 +47,6 @@ ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
 ARCHINCLUDESXX = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
 ARCHSCRIPT =
 
-ifeq ($(CONFIG_HOST_MACOS),y)
-  ARCHDEFINES  += -DCKSUM_SELF=$(if $<,$(word 1,$(shell cksum $<)))
-  ARCHINCLUDES += -include $(TOPDIR)/boards/sim/sim/sim/include/dummy.h
-endif
-
 # Add -fno-common because macOS "ld -r" doesn't seem to pick objects
 # for common symbols.
 ARCHCPUFLAGS += -fno-common