Fix config.h naming conflict.

Signed-off-by: fruffy <[email protected]>
p4lang · Feb 7, 2025 · aa5404a · aa5404a
1 parent b8be777
commit aa5404a
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 111 deletions.
diff --git a/backends/tofino/CMakeLists.txt b/backends/tofino/CMakeLists.txt
@@ -85,8 +85,7 @@ else()
     set (BFN_P4C_GIT_SHA $ENV{BFN_P4C_GIT_SHA})
   endif()
 endif()
-set (ENV{P4C_VERSION} "${BFN_P4C_VERSION} (SHA: ${BFN_P4C_GIT_SHA})")
-MESSAGE(STATUS "p4c-barefoot version: $ENV{P4C_VERSION}")
+MESSAGE(STATUS "p4c-barefoot version: ${BFN_P4C_VERSION}")
 
 # Generate the sha specific version file. It includes the GIT SHA.
 # Because this version changes frequently, we include it separately from the normal version files.

diff --git a/backends/tofino/bf-asm/CMakeLists.txt b/backends/tofino/bf-asm/CMakeLists.txt
@@ -189,7 +189,7 @@ set (HAVE_JBAY 1)
 set (BFASM_LIBS ${BFASM_LIBS} regs_jbay)
 
 # Other configuration files that need to be generated
-configure_file ("${BFASM_SOURCE_DIR}/cmake/config.h.in" "${BFASM_GEN_DIR}/config.h")
+configure_file ("${BFASM_SOURCE_DIR}/cmake/config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/config.h")
 
 set_source_files_properties (${BFAS_GEN_SOURCES} ${BFASM_GEN_DIR}/lex-yaml.c
   PROPERTIES GENERATED TRUE)

diff --git a/backends/tofino/bf-asm/action_bus.cpp b/backends/tofino/bf-asm/action_bus.cpp
@@ -17,8 +17,7 @@
 
 #include "action_bus.h"
 
-#include <config.h>
-
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/stage.h"
 #include "lib/hex.h"
 #include "misc.h"

diff --git a/backends/tofino/bf-asm/attached_table.cpp b/backends/tofino/bf-asm/attached_table.cpp
@@ -15,11 +15,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <config.h>
-
 #include <unordered_map>
 
 #include "action_bus.h"
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/stage.h"
 #include "backends/tofino/bf-asm/tables.h"
 #include "input_xbar.h"

diff --git a/backends/tofino/bf-asm/cmake/Abseil.cmake b/backends/tofino/bf-asm/cmake/Abseil.cmake
diff --git a/backends/tofino/bf-asm/cmake/config.h.in → backends/tofino/bf-asm/cmake/config.h.cmake b/backends/tofino/bf-asm/cmake/config.h.in → backends/tofino/bf-asm/cmake/config.h.cmake
@@ -7,8 +7,6 @@
 /* Define to 1 if you have the ucontext.h header */
 #cmakedefine HAVE_UCONTEXT_H @HAVE_UCONTEXT_H@
 
-
-
 /* Define to 1 if we include JBay */
 #cmakedefine HAVE_JBAY @HAVE_JBAY@
 
@@ -19,7 +17,7 @@
 #cmakedefine CONTEXT_SCHEMA_VERSION "@CONTEXT_SCHEMA_VERSION@"
 
 /* define the version */
-#define TFAS_VERSION "${BFN_P4C_VERSION}"
+#cmakedefine TFAS_VERSION "@BFN_P4C_VERSION@"
 
 
 #endif // __BFASM_CONFIG_H__
diff --git a/backends/tofino/bf-asm/crash.cpp b/backends/tofino/bf-asm/crash.cpp
@@ -15,8 +15,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <config.h>
 #include <errno.h>
+
+#include "backends/tofino/bf-asm/config.h"
 #if HAVE_EXECINFO_H
 #include <execinfo.h>
 #endif

diff --git a/backends/tofino/bf-asm/deparser.cpp b/backends/tofino/bf-asm/deparser.cpp
@@ -17,8 +17,7 @@
 
 #include "deparser.h"
 
-#include <config.h>
-
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/target.h"
 #include "constants.h"
 #include "lib/range.h"

diff --git a/backends/tofino/bf-asm/hash_dist.cpp b/backends/tofino/bf-asm/hash_dist.cpp
@@ -17,8 +17,7 @@
 
 #include "hash_dist.h"
 
-#include <config.h>
-
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/stage.h"
 #include "lib/range.h"
 

diff --git a/backends/tofino/bf-asm/input_xbar.cpp b/backends/tofino/bf-asm/input_xbar.cpp
@@ -17,11 +17,11 @@
 
 #include "input_xbar.h"
 
-#include <config.h>
 #include <stdlib.h>
 
 #include <fstream>
 
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/stage.h"
 #include "backends/tofino/bf-asm/tables.h"
 #include "hashexpr.h"

diff --git a/backends/tofino/bf-asm/instruction.cpp b/backends/tofino/bf-asm/instruction.cpp
@@ -17,9 +17,8 @@
 
 #include "instruction.h"
 
-#include <config.h>
-
 #include "action_bus.h"
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/stage.h"
 #include "backends/tofino/bf-asm/tables.h"
 #include "depositfield.h"

diff --git a/backends/tofino/bf-asm/instruction.h b/backends/tofino/bf-asm/instruction.h
@@ -18,10 +18,9 @@
 #ifndef BACKENDS_TOFINO_BF_ASM_INSTRUCTION_H_
 #define BACKENDS_TOFINO_BF_ASM_INSTRUCTION_H_
 
-#include <config.h>
-
 #include <functional>
 
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/tables.h"
 
 struct Instruction : public IHasDbPrint {

diff --git a/backends/tofino/bf-asm/match_table.cpp b/backends/tofino/bf-asm/match_table.cpp
@@ -15,11 +15,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <config.h>
-
 #include <unordered_map>
 
 #include "action_bus.h"
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/stage.h"
 #include "backends/tofino/bf-asm/tables.h"
 #include "input_xbar.h"

diff --git a/backends/tofino/bf-asm/parser-tofino-jbay.cpp b/backends/tofino/bf-asm/parser-tofino-jbay.cpp
@@ -17,8 +17,7 @@
 
 #include "parser-tofino-jbay.h"
 
-#include <config.h>
-
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/stage.h"
 #include "backends/tofino/bf-asm/target.h"
 #include "constants.h"

diff --git a/backends/tofino/bf-asm/salu_inst.cpp b/backends/tofino/bf-asm/salu_inst.cpp
@@ -15,12 +15,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <config.h>
-
 #include <cstring>
 
 #include <boost/optional.hpp>
 
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/stage.h"
 #include "backends/tofino/bf-asm/tables.h"
 #include "instruction.h"

diff --git a/backends/tofino/bf-asm/stage.cpp b/backends/tofino/bf-asm/stage.cpp
@@ -17,11 +17,11 @@
 
 #include "backends/tofino/bf-asm/stage.h"
 
-#include <config.h>
 #include <time.h>
 
 #include <fstream>
 
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/target.h"
 #include "deparser.h"
 #include "input_xbar.h"

diff --git a/backends/tofino/bf-asm/tables.cpp b/backends/tofino/bf-asm/tables.cpp
@@ -17,12 +17,11 @@
 
 #include "backends/tofino/bf-asm/tables.h"
 
-#include <config.h>
-
 #include <sstream>
 #include <string>
 
 #include "action_bus.h"
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/stage.h"
 #include "input_xbar.h"
 #include "instruction.h"

diff --git a/backends/tofino/bf-asm/tables.h b/backends/tofino/bf-asm/tables.h
@@ -18,8 +18,6 @@
 #ifndef BACKENDS_TOFINO_BF_ASM_TABLES_H_  // NOLINT(build/header_guard)
 #define BACKENDS_TOFINO_BF_ASM_TABLES_H_
 
-#include <config.h>
-
 #include <iostream>
 #include <set>
 #include <string>
@@ -28,6 +26,7 @@
 
 #include "alloc.h"
 #include "asm-types.h"
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/json.h"
 #include "backends/tofino/bf-asm/target.h"
 #include "constants.h"

diff --git a/backends/tofino/bf-asm/target.cpp b/backends/tofino/bf-asm/target.cpp
@@ -17,9 +17,8 @@
 
 #include "backends/tofino/bf-asm/target.h"
 
-#include <config.h>
-
 #include "asm-types.h"
+#include "backends/tofino/bf-asm/config.h"
 #include "backends/tofino/bf-asm/tables.h"
 #include "bson.h"
 #include "parser.h"

diff --git a/backends/tofino/bf-asm/target.h b/backends/tofino/bf-asm/target.h
@@ -18,9 +18,8 @@
 #ifndef TARGET_H_
 #define TARGET_H_
 
-#include <config.h>
-
 #include "asm-types.h"
+#include "backends/tofino/bf-asm/config.h"
 #include "bfas.h"
 #include "map.h"