TicketNo:AR000E2S5J

Description: adapter gcc and clang
Team:OTHERS
Feature or Bugfix:Feature
Binary Source:NA
PrivateCode(Yes/No):Yes

Change-Id: Ib798137cde164dbdaa98f3d5d79502322e953267
Reviewed-on: http://mgit-tm.rnd.huawei.com/10312719Tested-by: Npublic jenkins <public_jenkins@notesmail.huawei.com>
Reviewed-by: Nguanxun 00535119 <guanxun@huawei.com>
Reviewed-by: Nlibing 00373357 <libing23@huawei.com>

wpa_supplicant-2.9/BUILD.gn

@@ -5,7 +5,7 @@ import("//build/lite/ndk/ndk.gni")
 
 build_ext_component("wpa_supplicant-2.9") {
     outdir = rebase_path("$root_out_dir")
-    command = "sh build.sh ${outdir} ${ohos_build_ndk}"
+    command = "sh build.sh ${outdir} ${ohos_build_compiler} ${ohos_build_ndk}"
     exec_path = rebase_path(".", root_build_dir)
     deps = ["//drivers/hdf/lite/manager:hdf_core"]
 }

wpa_supplicant-2.9/build.sh

@@ -11,22 +11,32 @@ fi
 mkdir -p $ROOT_DIR/build/objs
 
 make -C $ROOT_DIR/wpa_supplicant/ clean
-make DEPDIR=$OUT_DIR -C $ROOT_DIR/wpa_supplicant/ -j
+make DEPDIR=$OUT_DIR -C $ROOT_DIR/wpa_supplicant/ COMPILER_TYPE=$2 -j
 make -C $ROOT_DIR/hostapd/ clean
-make DEPDIR=$OUT_DIR -C $ROOT_DIR/hostapd/ -j
+make DEPDIR=$OUT_DIR -C $ROOT_DIR/hostapd/ COMPILER_TYPE=$2 -j
 
 make -C $ROOT_DIR/build/ clean
-make DEPDIR=$OUT_DIR -C $ROOT_DIR/build/
+make DEPDIR=$OUT_DIR -C $ROOT_DIR/build/ COMPILER_TYPE=$2
 
-$ROOT_DIR/../../../prebuilts/gcc/linux-x86/arm/arm-linux-harmonyeabi-gcc/bin/arm-linux-harmonyeabi-strip $ROOT_DIR/build/libwpa.so
+if [ "$2" == "clang" ];
+then
+	$ROOT_DIR/../../../prebuilts/clang/harmonyos/linux-x86_64/llvm/bin/llvm-strip $ROOT_DIR/build/libwpa.so
+else
+    $ROOT_DIR/../../../prebuilts/gcc/linux-x86/arm/arm-linux-harmonyeabi-gcc/bin/arm-linux-harmonyeabi-strip $ROOT_DIR/build/libwpa.so
+fi
 cp $ROOT_DIR/build/libwpa.so $OUT_DIR
 rm -rf $ROOT_DIR/build/objs
 
-make DEPDIR=$OUT_DIR -C $ROOT_DIR/wpa_supplicant/ libwpa_client.so -j
-$ROOT_DIR/../../../prebuilts/gcc/linux-x86/arm/arm-linux-harmonyeabi-gcc/bin/arm-linux-harmonyeabi-strip $ROOT_DIR/wpa_supplicant/libwpa_client.so
+make DEPDIR=$OUT_DIR -C $ROOT_DIR/wpa_supplicant/ libwpa_client.so COMPILER_TYPE=$2 -j
+if [ "$2" == "clang" ];
+then
+	$ROOT_DIR/../../../prebuilts/clang/harmonyos/linux-x86_64/llvm/bin/llvm-strip $ROOT_DIR/wpa_supplicant/libwpa_client.so
+else
+    $ROOT_DIR/../../../prebuilts/gcc/linux-x86/arm/arm-linux-harmonyeabi-gcc/bin/arm-linux-harmonyeabi-strip $ROOT_DIR/wpa_supplicant/libwpa_client.so
+fi
 cp $ROOT_DIR/wpa_supplicant/libwpa_client.so $OUT_DIR
 
-if [ "$2" = true ]; then
+if [ "$3" = true ]; then
 cp $ROOT_DIR/wpa_supplicant/libwpa_client.so $OUT_DIR/ndk/sysroot/usr/lib
 cp $ROOT_DIR/build/libwpa.so $OUT_DIR/ndk/sysroot/usr/lib
 cp $ROOT_DIR/src/common/wpa_ctrl.h $OUT_DIR/ndk/sysroot/usr/include

wpa_supplicant-2.9/build/Makefile

@@ -2,6 +2,20 @@ CC = ../../../../prebuilts/gcc/linux-x86/arm/arm-linux-harmonyeabi-gcc/bin/arm-l
 
 CFLAGS  := -flto -MMD -O2 -g -w -fsigned-char
 
+ifeq ($(COMPILER_TYPE), clang)
+CC := ./../../../../prebuilts/clang/harmonyos/linux-x86_64/llvm/bin/clang
+CFLAGS += --target=arm-liteos
+CFLAGS += -march=armv7-a
+CFLAGS += -mfloat-abi=softfp
+CFLAGS += --sysroot=../../../../prebuilts/lite/sysroot
+
+LDFLAGS = -fuse-ld=lld
+LDFLAGS += --target=arm-liteos
+LDFLAGS += --sysroot=../../../../prebuilts/lite/sysroot
+LDFLAGS += -lc
+LDFLAGS += -v
+endif
+
 #TEST_AP = testap
 #TEST_WPA = testwpa
 
@@ -20,14 +34,14 @@ all : $(WPA_SHARED_LIB)
 	$(CC) $(CFLAGS) -c $< -o $@
 
 $(WPA_SHARED_LIB) :
-	$(CC)  -flto -O2  -shared -fPIC -Wl,-z,defs objs/*.o -o $@ $(WPA_LDFLAGS)
+	$(CC)  -flto -O2  -shared -fPIC -Wl,-z,defs objs/*.o -o $@ $(WPA_LDFLAGS) $(LDFLAGS)
 
 $(TEST_WPA) : $(OBJS_WPA)
-	$(CC) -o $@ $< $(TEST_LDFLAGS)
+	$(CC) -o $@ $< $(TEST_LDFLAGS) $(LDFLAGS)
 	rm -f $(CDEPS)
 
 $(TEST_AP) : $(OBJS_AP)
-	$(CC) -o $@ $< $(TEST_LDFLAGS)
+	$(CC) -o $@ $< $(TEST_LDFLAGS) $(LDFLAGS)
 	rm -f $(CDEPS)
 
 

wpa_supplicant-2.9/hostapd/Makefile

@@ -44,6 +44,19 @@ export BINDIR ?= /usr/local/bin/
 
 -include .config
 
+ifeq ($(COMPILER_TYPE), clang)
+CC := ./../../../../prebuilts/clang/harmonyos/linux-x86_64/llvm/bin/clang
+CFLAGS += --target=arm-liteos
+CFLAGS += -march=armv7-a
+CFLAGS += -mfloat-abi=softfp
+CFLAGS += --sysroot=../../../../prebuilts/lite/sysroot
+
+LDFLAGS = -fuse-ld=lld
+LDFLAGS += --target=arm-liteos
+LDFLAGS += --sysroot=../../../../prebuilts/lite/sysroot
+LDFLAGS += -lc
+endif
+
 ifndef CONFIG_NO_GITVER
 # Add VERSION_STR postfix for builds from a git repository
 ifeq ($(wildcard ../.git),../.git)

wpa_supplicant-2.9/src/utils/common.h

@@ -10,6 +10,7 @@
 #define COMMON_H
 
 #include "os.h"
+#include "byteswap.h"
 
 #if defined(__linux__) || defined(__GLIBC__)
 #include <endian.h>

wpa_supplicant-2.9/wpa_supplicant/Makefile

@@ -46,6 +46,19 @@ LIBS += -L$(DEPDIR) -lhdf_core -lhdf_osal -lsec_shared
 
 -include .config
 
+ifeq ($(COMPILER_TYPE), clang)
+CC := ./../../../../prebuilts/clang/harmonyos/linux-x86_64/llvm/bin/clang
+CFLAGS += --target=arm-liteos
+CFLAGS += -march=armv7-a
+CFLAGS += -mfloat-abi=softfp
+CFLAGS += --sysroot=../../../../prebuilts/lite/sysroot
+
+LDFLAGS = -fuse-ld=lld
+LDFLAGS += --target=arm-liteos
+LDFLAGS += --sysroot=../../../../prebuilts/lite/sysroot
+LDFLAGS += -lc
+endif
+
 ifndef CONFIG_NO_GITVER
 # Add VERSION_STR postfix for builds from a git repository
 ifeq ($(wildcard ../.git),../.git)