Additional gcc16 changes for Alveo compilation (#9738) (#9739)

(cherry picked from commit 59ec704)

Signed-off-by: Soren Soe <2106410+stsoe@users.noreply.github.com>

Author: stsoe

src/runtime_src/core/pcie/emulation/hw_emu/alveo_shim/shim.cxx

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (C) 2016-2022 Xilinx, Inc. All rights reserved.
-// Copyright (C) 2022 Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (C) 2022-2026 Advanced Micro Devices, Inc. All rights reserved.
 #include "shim.h"
 #include "system_hwemu.h"
 #include "plugin/xdp/device_offload.h"
@@ -1749,7 +1749,6 @@ namespace xclhwemhal2 {
     // Is there a way we can determine the name from the directories or otherwise?
     std::string bdName("dr"); // Used to be opencldesign. This is new default.
 
-    int i = 0;
     for(auto it :mBinaryDirectories)
     {
       std::string binaryDirectory = it.first;
@@ -1805,7 +1804,6 @@ namespace xclhwemhal2 {
         std::string destPath8 = "'" + std::string(path) + "/" + fileName + "_xsc_report.log'";
         systemUtil::makeSystemCall(xscReportLogFilePath, systemUtil::systemOperation::COPY, destPath8, std::to_string(__LINE__));
       }
-      i++;
     }
     mBinaryDirectories.clear();
     PRINTENDFUNC;

src/runtime_src/core/pcie/tools/xbflash.qspi/xspi.cpp

@@ -1,18 +1,6 @@
-/**
- * Copyright (C) 2020 Xilinx, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may
- * not use this file except in compliance with the License. A copy of the
- * License is located 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2020 Xilinx, Inc
+// Copyright (C) 2026 Advanced Micro Devices, Inc. All rights reserved.
 
 #include <iostream>
 #include <string>
@@ -647,9 +635,7 @@ int XSPI_Flasher::parseMCS(std::istream& mcsStream) {
     ELARecord record;
     bool endRecordFound = false;
 
-    int lineno = 0;
     while (!mcsStream.eof() && !endRecordFound) {
-    lineno++;
         std::string line;
         std::getline(mcsStream, line);
         if (line.size() == 0) {
@@ -1145,7 +1131,6 @@ bool XSPI_Flasher::finalTransfer(uint8_t *SendBufPtr, uint8_t *RecvBufPtr, int B
     uint8_t* RecvBufferPtr = RecvBufPtr;
 
     int RemainingBytes = ByteCount;
-    unsigned int BytesTransferred = 0;
 
     /*
     * Fill the DTR/FIFO with as many bytes as it will take (or as many as
@@ -1280,7 +1265,6 @@ bool XSPI_Flasher::finalTransfer(uint8_t *SendBufPtr, uint8_t *RecvBufPtr, int B
                     }
                 }
 
-                BytesTransferred += (DataWidth >> 3);
                 ByteCount -= (DataWidth >> 3);
                 StatusReg = XSpi_GetStatusReg();
                 if((StatusReg & (1<<10)) != 0) {

src/runtime_src/core/tools/xbmgmt2/flash/xmc.cpp

@@ -1,19 +1,6 @@
-/**
- * Copyright (C) 2019-2022 Xilinx, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may
- * not use this file except in compliance with the License. A copy of the
- * License is located 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.
- */
-
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2019-2022 Xilinx, Inc. All rights reserved.
+// Copyright (C) 2026 Advanced Micro Devices, Inc. All rights reserved.
 #include <iostream>
 #include <algorithm>
 #include <cstring>
@@ -177,7 +164,6 @@ int XMC_Flasher::xclUpgradeFirmware(std::istream& tiTxtStream) {
         }
         default:
         {
-            int spaces = 0;
             int digits = 0;
             std::locale loc;
 
@@ -187,7 +173,7 @@ int XMC_Flasher::xclUpgradeFirmware(std::istream& tiTxtStream) {
 
             for (unsigned int i = 0; i < line.size() && !errorFound; i++) {
                 if (line[i] == ' ') {
-                    spaces++;
+                    //spaces++;
                 } else if (std::isxdigit(line[i], loc)) {
                     digits++;
                 } else {

src/runtime_src/core/tools/xbmgmt2/flash/xspi.cpp

@@ -1,19 +1,6 @@
-/**
- * Copyright (C) 2019 - 2022 Xilinx, Inc
- * Copyright (C) 2022 Advanced Micro Devices, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may
- * not use this file except in compliance with the License. A copy of the
- * License is located 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.
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2019-2022 Xilinx, Inc. All rights reserved.
+// Copyright (C) 2022-2026 Advanced Micro Devices, Inc. All rights reserved.
 #include "xspi.h"
 #include "core/common/system.h"
 #include "core/common/device.h"
@@ -669,9 +656,7 @@ int XSPI_Flasher::parseMCS(std::istream& mcsStream) {
     ELARecord record;
     bool endRecordFound = false;
 
-    int lineno = 0;
     while (!mcsStream.eof() && !endRecordFound) {
-        lineno++;
         std::string line;
         std::getline(mcsStream, line);
         if (line.size() == 0) {
@@ -1153,7 +1138,6 @@ bool XSPI_Flasher::finalTransfer(uint8_t *SendBufPtr, uint8_t *RecvBufPtr, int B
     uint8_t* RecvBufferPtr = RecvBufPtr;
 
     int RemainingBytes = ByteCount;
-    unsigned int BytesTransferred = 0;
 
     /*
     * Fill the DTR/FIFO with as many bytes as it will take (or as many as
@@ -1288,7 +1272,6 @@ bool XSPI_Flasher::finalTransfer(uint8_t *SendBufPtr, uint8_t *RecvBufPtr, int B
                     }
                 }
 
-                BytesTransferred += (DataWidth >> 3);
                 ByteCount -= (DataWidth >> 3);
                 StatusReg = XSpi_GetStatusReg();
                 if((StatusReg & (1<<10)) != 0) {