From 331ba35aeb09ba24bb9d7368645d26e6254461fa Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 20 Dec 2020 19:35:08 +0100
Subject: [PATCH] Update

---
 src/common/Port.h                             |  2 +-
 src/libretro/Makefile                         | 24 +------------------
 src/libretro/gbaconv/gbaconv.c                |  2 --
 .../libretro-common/include/libretro.h        |  4 ++--
 4 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/common/Port.h b/src/common/Port.h
index 6e84f1ef..308d50f7 100644
--- a/src/common/Port.h
+++ b/src/common/Port.h
@@ -3,7 +3,7 @@
 
 #include "Types.h"
 
-#ifdef __CELLOS_LV2__
+#ifdef __PS3__
 /* PlayStation3 */
 #include <ppu_intrinsics.h>
 #endif
diff --git a/src/libretro/Makefile b/src/libretro/Makefile
index 572b5ca0..063e76bf 100644
--- a/src/libretro/Makefile
+++ b/src/libretro/Makefile
@@ -211,28 +211,6 @@ else ifeq ($(platform), qnx)
 	PLATFORM_DEFINES := -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
 	TILED_RENDERING=1
 
-# PS3
-else ifeq ($(platform), ps3)
-	TARGET := $(TARGET_NAME)_libretro_$(platform).a
-	CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
-	CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe
-	AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe
-	ENDIANNESS_DEFINES += -DMSB_FIRST
-	PLATFORM_DEFINES := -D__CELLOS_LV2__ -D__POWERPC__ -D__ppc__
-	STATIC_LINKING=1
-	TILED_RENDERING=1
-
-# PS3 (SNC)
-else ifeq ($(platform), sncps3)
-	TARGET := $(TARGET_NAME)_libretro_ps3.a
-	CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-	CXX = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe
-	AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.exe
-	ENDIANNESS_DEFINES += -DMSB_FIRST
-	PLATFORM_DEFINES := -D__CELLOS_LV2__ -D__POWERPC__ -D__ppc__
-	STATIC_LINKING=1
-	TILED_RENDERING=1
-
 # Lightweight PS3 Homebrew SDK
 else ifeq ($(platform), psl1ght)
 	TARGET := $(TARGET_NAME)_libretro_psl1ght.a
@@ -240,7 +218,7 @@ else ifeq ($(platform), psl1ght)
 	CXX = $(PS3DEV)/ppu/bin/ppu-g++$(EXE_EXT)
 	AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
 	ENDIANNESS_DEFINES += -DMSB_FIRST
-	PLATFORM_DEFINES := -D__CELLOS_LV2__ -D__POWERPC__ -D__ppc__
+	PLATFORM_DEFINES := -D__PS3__ -D__POWERPC__ -D__ppc__
 	STATIC_LINKING=1
 	TILED_RENDERING=1
 
diff --git a/src/libretro/gbaconv/gbaconv.c b/src/libretro/gbaconv/gbaconv.c
index a5019a37..afe98ecf 100644
--- a/src/libretro/gbaconv/gbaconv.c
+++ b/src/libretro/gbaconv/gbaconv.c
@@ -1,8 +1,6 @@
 #include <stdint.h>
 #include <stdio.h>
-#ifndef __CELLOS_LV2__
 #include <getopt.h>
-#endif
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/src/libretro/libretro-common/include/libretro.h b/src/libretro/libretro-common/include/libretro.h
index b3f1a16d..f97a9695 100644
--- a/src/libretro/libretro-common/include/libretro.h
+++ b/src/libretro/libretro-common/include/libretro.h
@@ -69,7 +69,7 @@ extern "C" {
 #      endif
 #    endif
 #  else
-#      if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__)
+#      if defined(__GNUC__) && __GNUC__ >= 4
 #        define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default")))
 #      else
 #        define RETRO_API RETRO_CALLCONV
@@ -2759,4 +2759,4 @@ RETRO_API size_t retro_get_memory_size(unsigned id);
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif