j2: fix libgcc and libstdc++ install

package/libgcc/Makefile

@@ -22,22 +22,18 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 libgcc-install:
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY)$(ADK_TARGET_ARCH_AVR32)$(ADK_TARGET_BINFMT_FLAT),)
 	$(INSTALL_DIR) ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
-ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),)
-ifeq ($(ADK_TARGET_ARCH_SH),y)
+ifeq ($(ADK_TARGET_CPU_SH_J2),y)
+	${CP} ${STAGING_TARGET_DIR}/usr/lib/!j2*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+endif
 ifeq ($(ADK_TARGET_CPU_SH_SH3),y)
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/!m3*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
 ifeq ($(ADK_TARGET_CPU_SH_SH4),y)
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/!m4*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
-else
-ifeq ($(ADK_TARGET_ARCH_AVR32),)
-ifeq ($(ADK_TARGET_BINFMT_FLAT),)
 	-${CP} ${STAGING_TARGET_DIR}/usr/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
-endif
-endif
-endif 
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

package/libstdcxx/Makefile

@@ -21,7 +21,6 @@ INSTALL_STYLE:=		manual
 do-install:
 ifeq ($(ADK_TARGET_BINFMT_FLAT)$(ADK_TARGET_USE_STATIC_LIBS_ONLY)$(ADK_TARGET_ARCH_METAG),)
 	${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
-ifeq ($(ADK_TARGET_ARCH_SH),y)
 ifeq ($(ADK_TARGET_CPU_SH_SH3),y)
 	$(CP) ${STAGING_TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}/!m3/libstdc++.so* \
 		${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
@@ -30,11 +29,9 @@ ifeq ($(ADK_TARGET_CPU_SH_SH4),y)
 	$(CP) ${STAGING_TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}/!m4/libstdc++.so* \
 		${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
 endif
-else
 	$(CP) ${STAGING_TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so* \
 		${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
 	-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py 2>/dev/null
 endif
-endif
 
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk